small refactoring for consistency