Simplifying macros