Cleanup (but still no newlines).