--- a/lib/amazing/options.rb
+++ b/lib/amazing/options.rb
@@ -6,72 +6,73 @@ require 'optparse'
 module Amazing
 
   # Parse and manage command line options
-  class Options
-    include Enumerable
-
-    def initialize(args)
-      @options = {}
-      @options[:config] = Dir["#{ENV["HOME"]}/.amazing/config.{rb,yml,yaml}"][0]
-      @options[:loglevel] = "info"
-      @options[:include] = []
-      @options[:autoinclude] = true
-      @options[:update] = []
+  class Options < Hash
+    def initialize(args=ARGV)
       @args = args
+      initialize_defaults
+      initialize_parser
+    end
+
+    def parse(args=@args)
+      @parser.parse!(args)
+    end
+
+    def help
+      @parser.help
+    end
+
+    private
+
+    def initialize_defaults
+      self[:config] = Dir["#{ENV["HOME"]}/.amazing/config.{rb,yml,yaml}"][0]
+      self[:loglevel] = "info"
+      self[:include] = []
+      self[:autoinclude] = true
+      self[:update] = []
+    end
+
+    def initialize_parser
       @parser = OptionParser.new do |opts|
         opts.on("-c", "--config FILE", "Configuration file (~/.amazing/config.{rb,yml,yaml})") do |config|
-          @options[:config] = config
+          self[:config] = config
         end
+
         opts.on("-l", "--log-level LEVEL", "Severity threshold (info)") do |level|
-          @options[:loglevel] = level
+          self[:loglevel] = level
         end
+
         opts.on("-s", "--stop", "Stop the running amazing process") do
-          @options[:stop] = true
+          self[:stop] = true
         end
+
         opts.on("-i", "--include SCRIPT", "Include a widgets script") do |script|
-          @options[:include] << script
+          self[:include] << script
         end
+
         opts.on("--no-auto-include", "Don't auto include from ~/.amazing/widgets/") do
-          @options[:autoinclude] = false
+          self[:autoinclude] = false
         end
+
         opts.on("-u", "--update [WIDGET]", "Update a widget and exit") do |widget|
           if widget
-            @options[:update] << widget
+            self[:update] << widget
           else
-            @options[:update] = :all
+            self[:update] = :all
           end
         end
+
         opts.on("-w", "--list-widgets [WIDGET]", "List available widgets or options and fields for a widget") do |widget|
-          @options[:listwidgets] = widget || true
+          self[:listwidgets] = widget || true
         end
+
         opts.on("-t", "--test-widget WIDGET [OPTIONS]", "Dump field values for a widget configured with inline YAML") do |widget|
-          @options[:test] = widget
+          self[:test] = widget
         end
+
         opts.on("-h", "--help", "You're looking at it") do
-          @options[:help] = true
+          self[:help] = true
         end
       end
     end
-
-    def each
-      @options.keys.each do |key|
-        yield key
-      end
-    end
-
-    def parse(args=@args)
-      @parser.parse!(args)
-    end
-
-    def help
-      @parser.help
-    end
-
-    def [](option)
-      @options[option]
-    end
-
-    def []=(option, value)
-      @options[option] = value
-    end
   end
 end