Beautification of macros