some cleanups after running through pylint