Another stab at formatting changes