Bit of cleaning, commenting.