Various smaller formatting changes