
        make cpp lint happy across the board

67e2327