more PEP8, Pylint fixes