add small refactoring