testing
Small comment cleanup
Minor code cleanup