Fix CodeClimate issues
Fix CodeClimate issues

nulib/avalon,avalonmediasystem/avalon,uvalib/avalon,avalonmediasystem/avalon,nulib/avalon,nulib/avalon,uvalib/avalon,uvalib/avalon,uvalib/avalon,avalonmediasystem/avalon,nulib/avalon,avalonmediasystem/avalon