Code review updates

These are updates based on your code review so far.  I put them in a branch off of channelwad.
Nit: this comment becomes superfluous and I'd just remove it.