Formatting changes and typos