Refactor skills finder