debt: move from singleton to class