Cleaned up map a little bit