Adding more in-line documentation and some cleanup
Merge pull request #80 from TheSerapher/inline-documentation

Adding more in-line documentation and some cleanup