Finish refactoring commands