Comment optimizations