Cleanup, renaming, countries