few more minor format changes to keep all things near the same