cleanup and moved geoname to own class