GeoModel small cleanup

*Changed all instances of r.toString() to use a String variable