naming, small refactoring