refactored map and infowindow to App vars