Refactor common macro
4 files changed