Ran tidy and added fix for 338
Ran tidy and added fix for 338

asherkhb/coge,asherkhb/coge,asherkhb/coge,LyonsLab/coge,LyonsLab/coge,asherkhb/coge,LyonsLab/coge,asherkhb/coge,asherkhb/coge,LyonsLab/coge,LyonsLab/coge,asherkhb/coge,LyonsLab/coge,LyonsLab/coge,asherkhb/coge,asherkhb/coge,LyonsLab/coge,LyonsLab/coge