Update Gemfile
Use query attributes
Remove empty helpers
Fix code breaking the Law of Demeter