small refactoring progress