removed some commented lines
restructured entities to follow convention