diff --git a/impressionist.gemspec b/impressionist.gemspec
index e462fe7..5cc1480 100644
--- a/impressionist.gemspec
+++ b/impressionist.gemspec
@@ -1,27 +1,32 @@
-# encoding: utf-8
-require File.expand_path('../lib/impressionist/version', __FILE__)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'impressionist/version'
 
 Gem::Specification.new do |s|
+  s.name          = 'impressionist'
+  s.version       = Impressionist::VERSION.dup
+  s.platform      = Gem::Platform::RUBY
+  s.licenses      = ['MIT']
+  s.summary       = 'Easy way to log impressions'
+  s.email         = 'john.mcaliley@gmail.com'
+  s.homepage      = 'http://github.com/charlotte-ruby/impressionist'
+  s.description   = 'Log impressions from controller actions or from a model'
+  s.authors       = ['johnmcaliley']
+
+  s.files         = `git ls-files`.split('\n')
+  s.test_files    = `git ls-files -- {spec,test_app/spec}/*`.split('\n')
+  s.require_path = 'lib'
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
+
   s.add_dependency 'httpclient', '~> 2.2'
   s.add_dependency 'nokogiri', '~> 1.5'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'rake', '>= 0.9'
-  s.add_development_dependency 'rails', '~>3.1'
+  s.add_development_dependency 'rails', '~> 3.1'
   s.add_development_dependency 'rdoc', '>= 2.4.2'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'systemu'
-  s.authors = ["johnmcaliley"]
-  s.description = "Log impressions from controller actions or from a model"
-  s.email = "john.mcaliley@gmail.com"
-  s.files = `git ls-files`.split("\n")
-  s.homepage = "https://github.com/charlotte-ruby/impressionist"
-  s.licenses = ["MIT"]
-  s.name = "impressionist"
-  s.require_paths = ["lib"]
-  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
-  s.summary = "Easy way to log impressions"
-  s.test_files = `git ls-files -- test_app/*`.split("\n")
-  s.version = Impressionist::VERSION
+
 end
diff --git a/lib/impressionist.rb b/lib/impressionist.rb
index 7ead8fe..8e4c7a5 100644
--- a/lib/impressionist.rb
+++ b/lib/impressionist.rb
@@ -1,7 +1,7 @@
-require "impressionist/engine.rb"
+require 'impressionist/engine'
 
 module Impressionist
-  # Define ORM
+  # Define default ORM
   mattr_accessor :orm
   @@orm = :active_record
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..92787cc
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,5 @@
+module Impressionist
+  def self.mattr_accessor(accessor)
+    class_variable_set("@@#{accessor}", accessor)
+  end
+end