
        Fix all tidy errors except licenses and line lengths

fe43203