Cleaned up user model