Minor formatting changes
More formatting fixes