diff --git a/lib/uh/wm/env.rb b/lib/uh/wm/env.rb
index 51ffc34..31c5192 100644
--- a/lib/uh/wm/env.rb
+++ b/lib/uh/wm/env.rb
@@ -48,7 +48,8 @@ module Uh
       def logger
         @logger ||= Logger.new(@output).tap do |o|
           o.level = debug? ? LOGGER_LEVEL_DEBUG :
-            verbose? ? LOGGER_LEVEL_VERBOSE : LOGGER_LEVEL
+            verbose? ? LOGGER_LEVEL_VERBOSE :
+            LOGGER_LEVEL
         end
       end
 
diff --git a/lib/uh/wm/runner.rb b/lib/uh/wm/runner.rb
index 5ee8d08..dfbcebd 100644
--- a/lib/uh/wm/runner.rb
+++ b/lib/uh/wm/runner.rb
@@ -66,25 +66,23 @@ module Uh
       end
 
       def register_manager_hooks
-        @events.on(:connecting) do |display|
+        @events.on :connecting do |display|
           @env.log_debug "Connecting to X server on `#{display}'"
         end
-        @events.on(:connected) do |display|
+        @events.on :connected do |display|
           @env.log "Connected to X server on `#{display}'"
         end
       end
 
-      def register_layout_event_hooks
-        @events.on(:connected) do |display|
+      def register_layout_hooks
+        @events.on :connected do |display|
           layout.register display
         end
       end
 
-      def register_key_bindings_hooks
+      def register_keybinds_hooks
         @env.keybinds.each do |keysym, code|
-          @events.on :key, *keysym do
-            @actions.evaluate code
-          end
+          @events.on(:key, *keysym) { @actions.evaluate code }
         end
       end
     end