Refactor to single User Controller