Refactor infowindow data