Clean up variable declarations.
Redact haversine.
Redacted haversine (defect id'd by cortesro)