A bit of cleanup based on a code review from a friend.

I still think its not "there" yet.  But soon.  :)