comment cleanup/additions