fixed entity constructor
Removed some unnecessary comments