Some tidying up before looking at expanding the supported protocols.