re-format macros for legibility