Improved geometry example and exercise