Refactoring with a 'before'