Refactor to singletons from static