Formatting changes

Some formatting changes