refactor2 tools