More minor formatting adjustments