run tool refactor