minor refactoring, added underscore