Fixed pins on the map and reduced some code