Restructuring. Warning cleaed