Added comments, changed method and variable names

Removed PointCriterion. Didn't make sense and wasn't serializable.