tidying a couple of things up and trying to get a higher pylint score...