Minor reformatting
Some private functions ought to be methods
Fixed mistake in list of countries
Fixed typo