formatting changes from 4.4. We are syncing these, even the ones that go against std to make comaprison easier