Refactoring and Debug plugin