PEP8 fixes; Clarify Error Messages