Comments and code cleanup
Merge branch 'issue-66' of github.com:UpThemes/Typecase into issue-66