Refactoring:
 - moved rendering from Entity to Model class
 - encapsulated Model class