worked on #12 Entity management. Docblocks and cleanup for entity