Refactor: Continued cleanup refactorings to the map element classes