PEP8 and pylint fixes