Minor Refactoring for User Model