cleanup and adding ST_ClosestDistance