refactoring with Jorge