Even more stylin'.
Merge pull request #107 from efairbanks/master

More style stuff