Nitpicky comment cleanup