CM: random readability and formatting

Nothing interesting--just some style tweaks while I was reading over the code doing some debugging.