Refactoring of points and evaluation