Clean up formatting in macros module