Refactor annotation pointcut classes to use only single class