ASM bytecode / method wrapping
some refactoring
Refactoring cleanup