Refactoring; preparing for UsersController