Geomap: Optimized and cleaned up formatting of code (see #4683)