More cleaning, and comments