Update for pep8 & signature change of method