minor, some cleanup of macros