Hopefully the last of the initial formatting changes