Tidy up the maps a bit.