refactored macroses