Fix new pep8 rules