Refactoring comment counts to be more concise.