added trim whitespace to macros