Cleaned up some things for pylint