Style fixes to pass Pylint/PEP8