more restructuring w/o changes