refactoring point manager