Comment convention and trivial refactoring.