Cleaned up Entity, GameBoard and GameState Classes