changed title from Minor class & method clean up to GeoShapes -- Minor class & method clean up
merged
mentioned in commit 99578131