pylint cleanups, a lot more to do I'm afraid