Restructured and cleaned