comment cleanup and more