Clean up comments as requested in the notes