few changes suggested by pylint