small refactoring changes