Refactor javassist instanciations