cleanup based on pylint