Formatted Entities

Began formatting the code for the entity class