Map code cleanup betterness