Just a few more little formatting changes