Refactoring commander