Formatting changes

General formatting changes