* More style and cleanliness.
Merge pull request #15 from armm77/master

* More style and cleanliness.