Update to fit new style guide.
Merge pull request #5 from ericroberts/style-update

Style update