Minor code and comment refactoring.