Small refactor to User