removed macros
cleaning up

removing comments