Further work on pep8 conformity