PEP8 and PyLint style fixes