Bugfix in generating list of country names
Remove comment
Move around year-related return values together
Remove year_interval which is not being used anymore.