working on the clean up of map.js