More minor formatting