A few formatting changes