Code cleanup: separate MapMaker.