Improved pep8 warnings