Clean up in comments