Refactored code in CountryVsCountryChart, updated JavaDocs