diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index d4dcfc9..2bb7f11 100644
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -83,13 +83,14 @@ def destroy
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_friendship
-      @friendship = Friendship.find(params[:id])
-    end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def friendship_params
-      params.require(:friendship).permit(:friend_id)
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_friendship
+    @friendship = Friendship.find(params[:id])
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def friendship_params
+    params.require(:friendship).permit(:friend_id)
+  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9fca547..3b8cc92 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,8 +2,9 @@ class UsersController < ApplicationController
   before_action :set_user, only: []
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_user
-      @user = User.find(params[:id])
-    end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_user
+    @user = User.find(params[:id])
+  end
 end
diff --git a/app/decorators/friendship_decorator.rb b/app/decorators/friendship_decorator.rb
index d6fcd55..a214a20 100644
--- a/app/decorators/friendship_decorator.rb
+++ b/app/decorators/friendship_decorator.rb
@@ -9,5 +9,4 @@ class FriendshipDecorator < Draper::Decorator
   #       object.created_at.strftime("%a %m/%d/%y")
   #     end
   #   end
-
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 782627e..c0fffb9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,10 +4,10 @@ class User < ActiveRecord::Base
   has_many :messages, through: :activities
 
   has_many :friendships
-  has_many :friends, -> { where.not(friendships: {approved: nil}) }, through: :friendships
+  has_many :friends, -> { where.not(friendships: { approved: nil }) }, through: :friendships
 
   has_many :inverse_friendships, class_name: 'Friendship', foreign_key: 'friend_id'
-  has_many :inverse_friends, -> { where.not(friendships: {approved: nil}) }, through: :inverse_friendships, source: :user
+  has_many :inverse_friends, -> { where.not(friendships: { approved: nil }) }, through: :inverse_friendships, source: :user
 
   validates :email, :first_name, :last_name, presence: true
   validates :id, absence: true, on: :create
diff --git a/spec/factories/friendships.rb b/spec/factories/friendships.rb
index ab1fc29..bdcdc31 100644
--- a/spec/factories/friendships.rb
+++ b/spec/factories/friendships.rb
@@ -1,8 +1,7 @@
 FactoryGirl.define do
   factory :friendship do
     user_id 1
-friend_id 1
-approved "2014-11-29 01:57:48"
+    friend_id 1
+    approved '2014-11-29 01:57:48'
   end
-
 end
diff --git a/spec/routing/friendships_routing_spec.rb b/spec/routing/friendships_routing_spec.rb
index 4b4978d..462d4cb 100644
--- a/spec/routing/friendships_routing_spec.rb
+++ b/spec/routing/friendships_routing_spec.rb
@@ -1,34 +1,34 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe FriendshipsController, type: :routing do
-  describe "routing" do
+  describe 'routing' do
 
-    it "routes to #index" do
-      expect(get: "/friendships").to route_to("friendships#index")
+    it 'routes to #index' do
+      expect(get: '/friendships').to route_to('friendships#index')
     end
 
-    it "routes to #new" do
-      expect(get: "/friendships/new").to route_to("friendships#new")
+    it 'routes to #new' do
+      expect(get: '/friendships/new').to route_to('friendships#new')
     end
 
-    it "routes to #show" do
-      expect(get: "/friendships/1").to route_to("friendships#show", id: "1")
+    it 'routes to #show' do
+      expect(get: '/friendships/1').to route_to('friendships#show', id: '1')
     end
 
-    it "routes to #edit" do
-      expect(get: "/friendships/1/edit").to route_to("friendships#edit", id: "1")
+    it 'routes to #edit' do
+      expect(get: '/friendships/1/edit').to route_to('friendships#edit', id: '1')
     end
 
-    it "routes to #create" do
-      expect(post: "/friendships").to route_to("friendships#create")
+    it 'routes to #create' do
+      expect(post: '/friendships').to route_to('friendships#create')
     end
 
-    it "routes to #update" do
-      expect(put: "/friendships/1").to route_to("friendships#update", id: "1")
+    it 'routes to #update' do
+      expect(put: '/friendships/1').to route_to('friendships#update', id: '1')
     end
 
-    it "routes to #destroy" do
-      expect(delete: "/friendships/1").to route_to("friendships#destroy", id: "1")
+    it 'routes to #destroy' do
+      expect(delete: '/friendships/1').to route_to('friendships#destroy', id: '1')
     end
 
   end
diff --git a/spec/views/friendships/edit.html.erb_spec.rb b/spec/views/friendships/edit.html.erb_spec.rb
index 27d9355..705f4b7 100644
--- a/spec/views/friendships/edit.html.erb_spec.rb
+++ b/spec/views/friendships/edit.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "friendships/edit", type: :view do
+RSpec.describe 'friendships/edit', type: :view do
   before(:each) do
     @friendship = assign(:friendship, Friendship.create!(
       user_id: 1,
@@ -8,14 +8,14 @@
     ))
   end
 
-  it "renders the edit friendship form" do
+  it 'renders the edit friendship form' do
     render
 
-    assert_select "form[action=?][method=?]", friendship_path(@friendship), "post" do
+    assert_select 'form[action=?][method=?]', friendship_path(@friendship), 'post' do
 
-      assert_select "input#friendship_user_id[name=?]", "friendship[user_id]"
+      assert_select 'input#friendship_user_id[name=?]', 'friendship[user_id]'
 
-      assert_select "input#friendship_friend_id[name=?]", "friendship[friend_id]"
+      assert_select 'input#friendship_friend_id[name=?]', 'friendship[friend_id]'
     end
   end
 end
diff --git a/spec/views/friendships/index.html.erb_spec.rb b/spec/views/friendships/index.html.erb_spec.rb
index 39a97d0..b342e00 100644
--- a/spec/views/friendships/index.html.erb_spec.rb
+++ b/spec/views/friendships/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "friendships/index", type: :view do
+RSpec.describe 'friendships/index', type: :view do
   before(:each) do
     assign(:friendships, [
       Friendship.create!(
@@ -14,9 +14,9 @@
     ])
   end
 
-  it "renders a list of friendships" do
+  it 'renders a list of friendships' do
     render
-    assert_select "tr>td", text: 1.to_s, count: 2
-    assert_select "tr>td", text: 2.to_s, count: 2
+    assert_select 'tr>td', text: 1.to_s, count: 2
+    assert_select 'tr>td', text: 2.to_s, count: 2
   end
 end
diff --git a/spec/views/friendships/new.html.erb_spec.rb b/spec/views/friendships/new.html.erb_spec.rb
index e116fd3..05c7883 100644
--- a/spec/views/friendships/new.html.erb_spec.rb
+++ b/spec/views/friendships/new.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "friendships/new", type: :view do
+RSpec.describe 'friendships/new', type: :view do
   before(:each) do
     assign(:friendship, Friendship.new(
       user_id: 1,
@@ -8,14 +8,14 @@
     ))
   end
 
-  it "renders new friendship form" do
+  it 'renders new friendship form' do
     render
 
-    assert_select "form[action=?][method=?]", friendships_path, "post" do
+    assert_select 'form[action=?][method=?]', friendships_path, 'post' do
 
-      assert_select "input#friendship_user_id[name=?]", "friendship[user_id]"
+      assert_select 'input#friendship_user_id[name=?]', 'friendship[user_id]'
 
-      assert_select "input#friendship_friend_id[name=?]", "friendship[friend_id]"
+      assert_select 'input#friendship_friend_id[name=?]', 'friendship[friend_id]'
     end
   end
 end
diff --git a/spec/views/friendships/show.html.erb_spec.rb b/spec/views/friendships/show.html.erb_spec.rb
index 7cc9caa..b999ee7 100644
--- a/spec/views/friendships/show.html.erb_spec.rb
+++ b/spec/views/friendships/show.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "friendships/show", type: :view do
+RSpec.describe 'friendships/show', type: :view do
   before(:each) do
     @friendship = assign(:friendship, Friendship.create!(
       user_id: 1,
@@ -8,7 +8,7 @@
     ))
   end
 
-  it "renders attributes in <p>" do
+  it 'renders attributes in <p>' do
     render
     expect(rendered).to match(/1/)
     expect(rendered).to match(/2/)