cleanup and moved geoname to own class
Merge pull request #3 from neculaesei/master

cleanup and moved geoname to own class