Minor changes in the map/ directory, mostly PEP8.