small refactoring of point manager