small refactoring
refactoring, part 2