Refactor model.user