Refactoring and documentation updates
Merge pull request #6 from doomspork/code-clean-up

Refactoring and documentation updates