more point refactoring