Cleaning up the polyline / polygon classes