Macro -> ConstantMacro | Formatter
refactoring