Macro1 refactoring