Break review tour refactoring