Code review - Don't change code while refactoring.