UsersController refactoring