Formatting and other cleanup.