PEP8, updated Countries, and updated Cities