Cleaned up map, added comments