I know that this PR is still a lot of work but since cosmetic changes aren't accepted, maybe we could indent the private methods as specified in the [coding conventions](http://guides.rubyonrails.org/contributing_to_ruby_on_rails.html#follow-the-coding-conventions)?