Review panels, step refactoring