Comment cleaneup