Small cleanup and comment a bit.