more refactoring
test