Made changes recommend by Matt Trout.
4 files changed