Static class refactor.