Extract constants
Introduce Distance class
Move constants back to Calc class
Remove clustering stuff
Remove Util class
Add endpoint and midpoint methods