Add comments, remove unused code, update error handling
Merge branch 'master' of https://github.com/ZoeEsaulova/CommenTerra