Refactor arguments of skill