Some appropriate changes in maps

-code cleanup
-etc.