Minor renaming and comment cleanup