cleaned up map