added whitespace padding to macros