Minor refactoring for comments