Major cleaning following first pylint