minor, small refactoring