Some additional refactoring and commenting of Entity.cs