Improve PEP8 compatibility