Refactor user update