Some finnacky formatting changes