Refactor user