comment cleanup and comment fix