Geomap: Additional code optimization and cleanup