Additional comment cleanup