Further minor formatting