Formatting setup 6.1.x

Here are the additional formatting changes I made. Thanks.