Update in accordance with changes to the 'protocol'
Some PEP8/pylint