Refactoring variables
Refactoring class Tools