refactoring, ClickedMarker -> ClickedMarkerHolder