Respect pep8 pylint

Some further code cleanup