Skill refactoring