more refactoring
nothing special