[Review]: PEP-8 fixes to several files in the map/ directory.

New pull request after the last one (#984)  accidentally included previous changes.

Could this not be done at importing time?