Refactor tools