code comments and restructuring