Rails 4.0 refactor