Further comment cleanup