More pep8 compliance