some fixes based on pylint