Cleanup (incorrect concatenation; formatting)