comments and restructuring