Refactor macros
Minor fix