cleaned up user model