Fix old Python2 Exception syntax. Cosmetic changes.
Closes #16
This will create a new commit in order to revert the existing changes.
