Further changes for pep8 compliance