Map.py tidying.