diff --git a/Gemfile b/Gemfile
index 82353ac..52253b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,8 +32,8 @@ end
 
 group :test do
   # rspec formatter
-  gem "fuubar",                    "2.0.0",  require: false
-  gem "nyan-cat-formatter",                  require: false
+  gem "fuubar", "2.0.0",    require: false
+  gem "nyan-cat-formatter", require: false
 
   # test coverage
   gem "simplecov",                 "0.10.0", require: false
diff --git a/diaspora_federation-rails.gemspec b/diaspora_federation-rails.gemspec
index 895fe9d..0fc1cac 100644
--- a/diaspora_federation-rails.gemspec
+++ b/diaspora_federation-rails.gemspec
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.description = "A rails engine that adds the diaspora* federation protocol to a rails app"
   s.license     = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
 
-  s.files      = Dir["app/**/*", "config/routes.rb", "lib/diaspora_federation/{engine,rails}.rb",
-                     "LICENSE", "README.md"]
+  s.files       = Dir["app/**/*", "config/routes.rb", "lib/diaspora_federation/{engine,rails}.rb",
+                      "LICENSE", "README.md"]
 
   s.required_ruby_version = "~> 2.0"
 
diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec
index 153fde6..fb9dd61 100644
--- a/diaspora_federation.gemspec
+++ b/diaspora_federation.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
                   "among the various installations of Diaspora*"
   s.license     = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
 
-  s.files      = Dir["lib/**/*", "LICENSE", "README.md"] - Dir["lib/diaspora_federation/{engine,rails}.rb"]
+  s.files       = Dir["lib/**/*", "LICENSE", "README.md"] - Dir["lib/diaspora_federation/{engine,rails}.rb"]
 
   s.required_ruby_version = "~> 2.0"
 
diff --git a/lib/diaspora_federation/discovery/web_finger.rb b/lib/diaspora_federation/discovery/web_finger.rb
index 06721cf..ba7a043 100644
--- a/lib/diaspora_federation/discovery/web_finger.rb
+++ b/lib/diaspora_federation/discovery/web_finger.rb
@@ -152,7 +152,7 @@ module DiasporaFederation
         links = data[:links]
 
         # TODO: remove! public key is deprecated in webfinger
-        public_key  = parse_link(links, REL_PUBKEY)
+        public_key = parse_link(links, REL_PUBKEY)
 
         new(
           acct_uri:    data[:subject],
diff --git a/spec/factories.rb b/spec/factories.rb
index 8d53271..ed7c60a 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -13,9 +13,7 @@ FactoryGirl.define do
     diaspora_id
     url "http://localhost:3000/"
     serialized_public_key { generate(:public_key) }
-    after(:create) do |u|
-      u.save
-    end
+    after(:create, &:save)
   end
 
   factory :webfinger, class: DiasporaFederation::Discovery::WebFinger do
diff --git a/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb b/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
index d3f2575..00f5e02 100644
--- a/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
@@ -26,7 +26,7 @@ module DiasporaFederation
 
     %i(hcard_url profile_url atom_url).each do |prop|
       describe "##{prop}" do
-        it_behaves_like "a url validator without path"  do
+        it_behaves_like "a url validator without path" do
           let(:property) { prop }
         end
 
diff --git a/test/dummy/app/models/person.rb b/test/dummy/app/models/person.rb
index 4fce4cd..26d517b 100644
--- a/test/dummy/app/models/person.rb
+++ b/test/dummy/app/models/person.rb
@@ -7,9 +7,9 @@ class Person < ActiveRecord::Base
   def atom_url;    "#{url}public/#{nickname}.atom" end
   def salmon_url;  "#{url}receive/users/#{guid}" end
 
-  def nickname;         diaspora_id.split("@")[0] end
+  def nickname; diaspora_id.split("@")[0] end
 
-  def photo_default_url;  "#{url}assets/user/default.png" end
+  def photo_default_url; "#{url}assets/user/default.png" end
 
   def searchable; true end
   def full_name;  "Dummy User" end