refactoring with sandro