A little bit of cleanup

This cleanup is based on the comments via rictic on github. (Our first
code review!).