More minor formatting changes