Refactor User controller