Cleaned up Entities  - comments etc