Cleaning up comments in preparation for A4