diff --git a/lib/Sync/FTP.rb b/lib/Sync/FTP.rb
index 1bb2a55..0d324e7 100644
--- a/lib/Sync/FTP.rb
+++ b/lib/Sync/FTP.rb
@@ -1,111 +1,81 @@
 #!/usr/bin/ruby
 # author: nishiki
 # mail: nishiki@yaegashi.fr
-# info: a simple script who manage your passwords
 
+require 'rubygems'
+require 'i18n'
+require 'net/ftp'
+		
 module MPW
-
-	module Sync
-
-		require 'rubygems'
-		require 'i18n'
-		require 'net/ftp'
-		
-		class FTP
-		
-			attr_accessor :error_msg
-			attr_accessor :enable
-		
-			# Constructor
-			def initialize
-				@error_msg = nil
-				@enable    = false
-			end
-		
-			# Connect to server
-			# @args: host -> the server host
-			#        port -> ther connection port
-			#        gpg_key -> the gpg key
-			#        password -> the remote password
-			#        suffix -> the suffix file
-			# @rtrn: false if the connection fail
-			def connect(host, user, password, path, port=nil)
-				@host     = host
-				@user     = user
-				@password = password
-				@path     = path
-				@port     = port.instance_of?(Integer) ? 21 : port
-					
-				Net::FTP.open(@host) do |ftp|
-					ftp.login(@user, @password)
-					@enable = true
-				end
-			rescue Exception => e
-				@error_msg = "#{I18n.t('error.sync.connection')}\n#{e}"
-				@enable    = false
-			else
-				return @enable
-			end
-		
-			# Get data on server
-			# @args: gpg_password -> the gpg password
-			# @rtrn: nil if nothing data or error
-			def get(gpg_key, gpg_password)
-				return nil if not @enable
-				
-				tmp_file = tmpfile
-				Net::FTP.open(@host) do |ftp|
-					ftp.login(@user, @password)
-					ftp.gettextfile(@path, tmp_file)
-				end
-			
-				mpw = MPW.new(tmp_file, gpg_key)
-				if not mpw.decrypt(gpg_password)
-					@error_msg = mpw.error_msg
-					return nil
-				end
-		
-				File.unlink(tmp_file)
-				return mpw.search
-			rescue Exception => e
-				@error_msg = "#{I18n.t('error.sync.download')}\n#{e}"
-				return nil
-			end
-		
-			# Update the remote data
-			# @args: data -> the data to send on server
-			# @rtrn: false if there is a problem
-			def update(data)
-				return true if not @enable
-		
-				tmp_file = tmpfile
-				File.open(tmp_file, "w") do |file|
-					file << data
-				end
-
-				Net::FTP.open(@host) do |ftp|
-					ftp.login(@user, @password)
-					ftp.puttextfile(tmp_file, @path)
-				end
-
-				File.unlink(tmp_file)
-				return true
-			rescue Exception => e
-				@error_msg = "#{I18n.t('error.sync.upload')}\n#{e}"
-				return false
-			end
-
-			# Generate a random string
-			# @rtrn: a random string
-			def tmpfile
-				result = ''
-				result << ([*('A'..'Z'),*('a'..'z'),*('0'..'9')]).sample(6).join
-		
-				return "/tmp/mpw-#{result}"
-			end
+	class FTP
 	
+		attr_accessor :error_msg
+		attr_accessor :enable
+	
+		# Constructor
+		# @args: host -> the server host
+		#        port -> ther connection port
+		#        gpg_key -> the gpg key
+		#        password -> the remote password
+		#        suffix -> the suffix file
+		def initialize(host, user, password, path, port=nil)
+			@error_msg = nil
+			@enable    = false
+
+			@host     = host
+			@user     = user
+			@password = password
+			@path     = path
+			@port     = port.instance_of?(Integer) ? 21 : port
+		end
+	
+		# Connect to server
+		# @rtrn: false if the connection fail
+		def connect
+			Net::FTP.open(@host) do |ftp|
+				ftp.login(@user, @password)
+				@enable = true
+			end
+		rescue Exception => e
+			@error_msg = "#{I18n.t('error.sync.connection')}\n#{e}"
+			@enable    = false
+		else
+			return @enable
+		end
+	
+		# Get data on server
+		# @args: gpg_password -> the gpg password
+		# @rtrn: nil if nothing data or error
+		def get(file_tmp)
+			return false if not @enable
+			
+			Net::FTP.open(@host) do |ftp|
+				ftp.login(@user, @password)
+				ftp.gettextfile(@path, file_tmp)
+			end
+		
+			return true
+		rescue Exception => e
+			@error_msg = "#{I18n.t('error.sync.download')}\n#{e}"
+			return false
+		end
+	
+		# Update the remote data
+		# @args: data -> the data to send on server
+		# @rtrn: false if there is a problem
+		def update(file_gpg)
+			return true if not @enable
+	
+			Net::FTP.open(@host) do |ftp|
+				ftp.login(@user, @password)
+				ftp.puttextfile(file_gpg, @path)
+			end
+
+			return true
+		rescue Exception => e
+			@error_msg = "#{I18n.t('error.sync.upload')}\n#{e}"
+			return false
 		end
 
 	end
-
 end
diff --git a/lib/Sync/SSH.rb b/lib/Sync/SSH.rb
index db721ca..ddb00b5 100644
--- a/lib/Sync/SSH.rb
+++ b/lib/Sync/SSH.rb
@@ -4,7 +4,6 @@
 
 require 'rubygems'
 require 'i18n'
-require 'tempfile'
 require 'net/ssh'
 require 'net/sftp'