Refactor UserController

See Refactoring Wiki