Refactor/user controller