Core : cleaned up User model class