Slight refactoring of Model class