Reformating, standardizes some macros