Clean up and formatting.