More minor formatting fixes