refactor partial code, marker infowindow need to be fixed