Doc string format fix
Added comments and formatting
Merge pull request #23 from davidfischer/code-cleanup

Code cleanup