Refactor Users controller