SKTools refactor