diff --git a/bin/kutu.rb b/bin/kutu.rb
index 02e5635..30a2392 100755
--- a/bin/kutu.rb
+++ b/bin/kutu.rb
@@ -1,26 +1,26 @@
 #!/usr/bin/env ruby
 
-# require x-kutu library for all x11 functions
+# Require X-kutu library for all x11 functions
 
-require_relative "../src/ruby/x-kutu"
+require_relative "../src/ruby/X-kutu"
 
 
-# require dependencies
+# Require dependencies
 
 require 'json'
 require 'socket'
 
 
-# initialize x
+# Initialize X
 
-if x.deploy >= 0
-  puts "started kutu wm for x11 successfully! :)"
+if X.deploy >= 0
+  puts "Started kutu WM for X11 successfully! :)"
 else
-  raise "failed to deploy x, try running using xinit or startx."
+  raise "Failed to deploy X, try running using xinit or startx."
 end
 
 
-# require submodules
+# Require submodules
 
 require_relative "../src/ruby/utils"
 require_relative "../src/ruby/controller"
@@ -28,19 +28,17 @@ require_relative "../src/ruby/window"
 require_relative "../src/ruby/workspace"
 require_relative "../src/ruby/events"
 require_relative "../src/ruby/commands"
-require_relative "../src/ruby/factory"
-require_relative "../src/ruby/config"
 
 
-# cleanup on exit
+# Cleanup on exit
 
 at_exit do
-  x.cleanup
-  puts "exited kutu wm, sadly :("
+  X.cleanup
+  puts "Exited kutu WM, sadly :("
 end
 
 
-# globals
+# Globals
 
 $monitors = {}
 $windows = {}
@@ -52,42 +50,41 @@ $mousebind_actions = {}
 
 $mouse_data = {}
 
-$root = x.get_root
+$root = X.get_root
 $rect = {}
 
 
-# initialize monitors
+# Initialize monitors
 
 load_monitors!
 
 
-# load config
+# Run startup script
 
 load_config!
 
+# Setup unix socket
 
-# setup unix socket
+SOCK_PATH = "/tmp/kutu.sock"
+File.delete SOCK_PATH if File.exist? SOCK_PATH
 
-sock_path = "/tmp/kutu.sock"
-file.delete sock_path if file.exist? sock_path
-
-$socket = socket.new :unix, :dgram
-$socket.bind socket.pack_sockaddr_un(sock_path)
+$socket = Socket.new :UNIX, :DGRAM
+$socket.bind Socket.pack_sockaddr_un(SOCK_PATH)
 
 
-# main loop
+# Main loop
 
 loop do
   sleep 0.001
 
-  if io.select([$socket], nil, nil, 0)
+  if IO.select([$socket], nil, nil, 0)
     command, sender = $socket.recvfrom 1024
     reply = handle_command command
-    $socket.send json.generate(reply), 0, sender
+    $socket.send JSON.generate(reply), 0, sender
   end
 
-  event_pointer = x.next_event
-  handle_event x.translate_event(event_pointer) if !event_pointer.null?
+  event_pointer = X.next_event
+  handle_event X.translate_event(event_pointer) if !event_pointer.null?
 
-  x.flush
+  X.flush
 end