Cleanup and formatting.