cleaned up map a bit