Change file according to coding conventions
These are my entities, task #40 DONE