upgrading to rails 4.0, refactoring