Formatting and Cleanup.