refactor one-off skills