Minor code, comment cleanup