Refactoring difficulty handling