Various formatting changes
Minor formatting changes