Clean-up (pylint)