Finished off formatting code in macros.