Misc formatting changes