-small refactoring changes