refactor: use macro
2 files changed