More formatting changes per @waywardmonkeys