#534 Some minor formatting changes