more rails 4 refactoring