Began re-commenting entity classes. Refactored entity classes slightly
to clean things up.
Merge branch 'FixerBranch' of https://github.com/janakihere/automated-data-generator.git into FixerBranch