Formatting and structure changes.