fixed some spacing in in preprocessor macros