some PEP8 improvements