minor underscore refactoring