Code review updates

These are updates based on your code review so far.  I put them in a branch off of channelwad.
Haha, I don't think I need the for loop here.  Good catch!