Refactoring the classes that use static methods