cleanind and restructuring