other changes (mostly pylint remarks)