add pinImage CurrentLocation + code cleanup