jacket-44
Macro refactoring