Cleanup and update of macros