remove unused var
Use uppercase for country variant
Merge pull request #8 from cotal/master

Improve quality