Simple and minor formatting changes