Formatting
Allow for non point geometries
Order for readability; remove it non preformant