Code clean and refactor
Merge pull request #104 from Masadow/macroCleaning

Code clean and refactor