More PEP-8 fixes to map-related files