After-review refactoring