minor refactoring and renaming of the InvocationHandler impl