Refactored tools