Refactoring using instructions