modified cleaned up map
cleaned up map