refactor-safe

Safe refactoring workflow (small steps, tests, diagnostics)