diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 23af8c91b..625452196 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,4 @@
 class AccountController < ApplicationController
-
   before_action :authenticate_user!
   before_action :set_account
   load_and_authorize_resource class: "User"
diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index 0399ccd63..6c1d994ee 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -1,5 +1,4 @@
 class Admin::CommentsController < Admin::BaseController
-
   has_filters %w{all with_confirmed_hide}
 
   before_filter :load_comment, only: [:confirm_hide, :restore]
diff --git a/app/controllers/admin/moderators_controller.rb b/app/controllers/admin/moderators_controller.rb
index f2ef6f1c3..e15e9273f 100644
--- a/app/controllers/admin/moderators_controller.rb
+++ b/app/controllers/admin/moderators_controller.rb
@@ -1,5 +1,4 @@
 class Admin::ModeratorsController < Admin::BaseController
-
   load_and_authorize_resource
 
   def index
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index 0e704e9a1..e5ba390e1 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -1,5 +1,4 @@
 class Admin::OrganizationsController < Admin::BaseController
-
   has_filters %w{all pending verified rejected}, only: :index
 
   load_and_authorize_resource except: :search
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index ecf7f206a..cf104edf0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,5 +1,4 @@
 class Admin::UsersController < Admin::BaseController
-
   has_filters %w{all with_confirmed_hide}, only: :index
 
   before_filter :load_user, only: [:confirm_hide, :restore]
diff --git a/app/controllers/api/stats_controller.rb b/app/controllers/api/stats_controller.rb
index d44262b45..fc0bf3563 100644
--- a/app/controllers/api/stats_controller.rb
+++ b/app/controllers/api/stats_controller.rb
@@ -1,4 +1,5 @@
 class Api::StatsController < Api::ApiController
+
   def show
     unless params[:events].present? || params[:visits].present?
       return render json: {}, status: :bad_request
@@ -19,4 +20,5 @@ class Api::StatsController < Api::ApiController
 
     render json: ds.build
   end
+
 end
diff --git a/app/controllers/moderation/base_controller.rb b/app/controllers/moderation/base_controller.rb
index f2a794526..de0c46a79 100644
--- a/app/controllers/moderation/base_controller.rb
+++ b/app/controllers/moderation/base_controller.rb
@@ -2,9 +2,9 @@ class Moderation::BaseController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :verify_moderator
 
   skip_authorization_check
-  before_action :verify_moderator
 
   private
 
diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb
index 065516531..40e475b21 100644
--- a/app/controllers/moderation/comments_controller.rb
+++ b/app/controllers/moderation/comments_controller.rb
@@ -1,6 +1,6 @@
 class Moderation::CommentsController < Moderation::BaseController
-
   has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+
   before_filter :load_comments, only: :index
 
   load_and_authorize_resource
diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb
index 5fdd19049..29e01d378 100644
--- a/app/controllers/moderation/debates_controller.rb
+++ b/app/controllers/moderation/debates_controller.rb
@@ -1,5 +1,4 @@
 class Moderation::DebatesController < Moderation::BaseController
-
   has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
 
   before_filter :load_debates, only: :index
diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index 630cc64e4..6445622e2 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -1,4 +1,5 @@
 class Organizations::RegistrationsController < Devise::RegistrationsController
+
   def new
     super do |user|
       user.build_organization
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 784906618..11f715960 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,5 +1,4 @@
 class PagesController < ApplicationController
-
   skip_authorization_check
 
   def census_terms
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 1e76feb42..fe224eb8d 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,6 +1,6 @@
 class StatsController < ApplicationController
-  skip_authorization_check
   before_action :verify_administrator
+  skip_authorization_check
 
   def show
     @event_types = Ahoy::Event.select(:name).uniq.pluck(:name)
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 8588ba243..423ecedad 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,4 +1,5 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+
   def self.provides_callback_for(provider)
     class_eval %Q{
       def #{provider}
@@ -26,4 +27,5 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       finish_signup_path
     end
   end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 77afc1317..33fc7e0fa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
 module ApplicationHelper
+
   def percentage(vote, debate)
     return "0%" if debate.total_votes == 0
     debate.send(vote).percent_of(debate.total_votes).to_s + "%"
diff --git a/app/helpers/cache_keys_helper.rb b/app/helpers/cache_keys_helper.rb
index 9aa6000cc..38445ae02 100644
--- a/app/helpers/cache_keys_helper.rb
+++ b/app/helpers/cache_keys_helper.rb
@@ -1,4 +1,5 @@
 module CacheKeysHelper
+
   def locale_and_user_status
     @cache_key_user ||= calculate_user_status
     "#{I18n.locale}/#{@cache_key_user}"
@@ -17,4 +18,5 @@ module CacheKeysHelper
 
     user_status
   end
+
 end
\ No newline at end of file
diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb
index b54c86b48..b5ba67f41 100644
--- a/app/helpers/flags_helper.rb
+++ b/app/helpers/flags_helper.rb
@@ -1,4 +1,5 @@
 module FlagsHelper
+
   def show_flag_action?(flaggable)
     current_user && !own_flaggable?(flaggable) && !flagged?(flaggable)
   end
@@ -24,4 +25,5 @@ module FlagsHelper
       flaggable.author_id == current_user.id
     end
   end
+
 end
diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb
index e517767e3..b852afe9c 100644
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -1,4 +1,5 @@
 module StatsHelper
+
   def events_chart_tag(events, opt={})
     events = events.join(',') if events.is_a? Array
     opt[:data] ||= {}
diff --git a/app/models/flag.rb b/app/models/flag.rb
index a8be6da76..2d13d26d9 100644
--- a/app/models/flag.rb
+++ b/app/models/flag.rb
@@ -1,5 +1,4 @@
 class Flag < ActiveRecord::Base
-
   belongs_to :user
   belongs_to :flaggable, polymorphic: true, counter_cache: true
 
diff --git a/app/models/organization.rb b/app/models/organization.rb
index a4561ba7f..fa991fc05 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -1,5 +1,4 @@
 class Organization < ActiveRecord::Base
-
   belongs_to :user
 
   validates :name, presence: true
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 8e1504bf3..f696ceefd 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -1,5 +1,4 @@
 class Setting < ActiveRecord::Base
-
   validates :key, presence: true, uniqueness: true
 
   default_scope { order(key: :desc) }