Refactoring - static methods