Refactor skill methods.