diff --git a/lib/cinch/helpers.rb b/lib/cinch/helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/cinch/helpers.rb
+++ b/lib/cinch/helpers.rb
@@ -52,7 +52,7 @@ module Cinch
     def timer(interval, options = {}, &block)
       options = {:method => :timer, :threaded => true}.merge(options)
       block ||= self.method(options[:method])
-      timer = Cinch::Timer.new(bot, interval, {:threaded => options[:threaded]}, &block)
+      timer = Cinch::Timer.new(bot, interval, options[:threaded], &block)
       timer.start
 
       timer
diff --git a/lib/cinch/timer.rb b/lib/cinch/timer.rb
index <HASH>..<HASH> 100644
--- a/lib/cinch/timer.rb
+++ b/lib/cinch/timer.rb
@@ -2,22 +2,20 @@ module Cinch
   class Timer
     attr_reader :bot
     attr_reader :interval
-    attr_reader :options
+    attr_accessor :threaded
     attr_reader :block
-    def initialize(bot, interval, options = {}, &block)
+    alias_method :threaded?, :threaded
+
+    def initialize(bot, interval, threaded = true, &block)
       @bot      = bot
       @interval = interval
-      @options  = options
+      @threaded = threaded
       @block    = block
 
       @started = false
       @thread  = nil
     end
 
-    def threaded?
-      @options[:threaded]
-    end
-
     def started?
       @started
     end
remove Timer#options and turn the only option, threaded, into an attribute