Refactoring
test