Additional formatting changes upon suggestion of Simon