Alikins/pylint cleanup