Formatting and cleanup.