Use strobe macros. Clean up and reformat.