solved macros problem
code cleanup