Use err in Data_source
Clean up Geometry module