User controller refactor

![](http://media2.giphy.com/media/cJgkhpLgsuTkY/giphy.gif)