Some small cleanups and comments