Formatting changes and fixed content