Remove public property aspectName and make pointcut protected
Minor cleaning and CS fixes