Refactor - Tools