cleaning up restructuring