Refactor User