refactor Entity to Model, comments