Further tweaking of error messages
PEP8