Cleaned up the User model