Add EnityType class
Minor cleanup