Code clean up and documentation updates
Merge pull request #24 from rrati/cleanup-and-docs

Code clean up and documentation updates