pep8/pylint changes to be squashed