some more minor formatting cleanup