Script review
Entity classes code review