Made map a little cleaner