Fix pep8 codestyle warnings