Refactors all of the map code into the map controller
Adds a clarification comment