More helpful error message
A few PEP8 fixes