Refactor user model to be easier to read.