Minor update to coding standard used and addition of geonameid to output XML