Code cleanup. Added map.