Some Pep8 improvments