Refactoring workflow