Remove pep8 warnings