partial formatting cleanup (stopped at the d3 boondoggle