PEP8 and Pylint fixes