Minor code and comment cleanup
Minor code and comment cleanup