Fix pep8 errors

pep8 1.6.4 detects more issues