Small refactor for Tool Belt