Refactor skills