diff --git a/extensions/demos/html/passwd_manager_theft.html b/extensions/demos/html/passwd_manager_theft.html
deleted file mode 100644
index 4a2d70c50..000000000
--- a/extensions/demos/html/passwd_manager_theft.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-	<title>BeEF Password Manager Theft Demo</title>
-</head>
-
-<body>
-	<h2>Password Manager Theft Demo</h2>
-	
-	<p>
-		Instructions:<br>
-		<br>
-		1. Write a fake username and password in the form below<br>
-		2. After having submitted the form, <u>make sure you tell firefox that you want to save</u><br>
-		3. Exploit your hooked browser with the password manager theft command module.
-	</p>
-	
-	<p>
-		<form action="passwd_manager_theft.html" method="POST">
-			Username: <input type="text" name="username"><br><br>
-			Password: <input type="password" name="random"></br>
-			<input type="submit" value="submit">
-		</form>
-	</p>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/extensions/events/handler.rb b/extensions/events/handler.rb
index 0358ea620..a6e83edb5 100644
--- a/extensions/events/handler.rb
+++ b/extensions/events/handler.rb
@@ -60,24 +60,24 @@ module Events
     def parse(event)
       case event['type']
         when 'click'
-          result = event['time'].to_s+'s - [Mouse Click] x: '+event['x'].to_s+' y:'+event['y'].to_s+' > '+event['target'].to_s
+          result = "#{event['time']}s - [Mouse Click] x: #{event['x']} y:#{event['y']} > #{event['target']}"
         when 'focus'
-          result = event['time'].to_s+'s - [Focus] Browser has regained focus.'
+          result = "#{event['time']}s - [Focus] Browser has regained focus."
         when 'copy'
-          result = event['time'].to_s+'s - [User Copied Text] "'+event['data'].to_s+'"'
+          result = "#{event['time']}s - [User Copied Text] \"#{event['data']}\""
         when 'cut'
-          result = event['time'].to_s+'s - [User Cut Text] "'+event['data'].to_s+'"'
+          result = "#{event['time']}s - [User Cut Text] \"#{event['data']}\""
         when 'paste'
-          result = event['time'].to_s+'s - [User Pasted Text] "'+event['data'].to_s+'"'
+          result = "#{event['time']}s - [User Pasted Text] \"#{event['data']}\""
         when 'blur'
-          result = event['time'].to_s+'s - [Blur] Browser has lost focus.'
+          result = "#{event['time']}s - [Blur] Browser has lost focus."
         when 'keys'
-          result = event['time'].to_s+'s - [User Typed] "'+event['data'].to_s+'" > '+event['target'].to_s
+          result = "#{event['time']}s - [User Typed] \"#{event['data']}\" > #{event['target']}"
         when 'submit'
-          result = event['time'].to_s+'s - [Form Submitted] '+event['data'].to_s+' > '+event['target'].to_s
+          result = "#{event['time']}s - [Form Submitted] \"#{event['data']}\" > #{event['target']}"
         else
           print_debug '[EVENTS] Event handler has received an unknown event'
-          result = 'Unknown event'
+          result = "#{event['time']}s - Unknown event"
       end
       result
     end
