Clear the structure and add more comments