refactoring
fixed MacroProcessor
CodeQualtity!