Comments and comment cleanup