Minor code and comment cleanup