STY: partial pylint cleanup