Refactor how point separation is computed
Alter mean-square-diff calculation slightly