Misc pylint cleanups and a few variable fixes ;)