finish refactoring all skills