Minor code and comment polishing