reformat as required to pass PSR2 formatting (one PSR2 issue remains with wait_commit() in Channel.php because we are extending a base method that has an underscore and thus does not comply with PSR2)