Refactoring before correcting the Model class