refactoring some singleton objects