Refactor model user