Clean-up for pylint