Further minor formatting changes