Cleaned up some pylint complaints