next small refactoring step