Refactoring on bench