pointcut service refactoring
pointcut service refactoring + some tests