Clean up benchmark tool and application code

[ambushwork]

What does this PR do?

Clean up the code according to the PR reviews

Review checklist (to be filled by reviewers)

• Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
• Make sure you discussed the feature or bugfix with the maintaining team in an Issue
• Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.05%. Comparing base (27f8ab9) to head (c349c5e).

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2184      +/-   ##
===========================================
+ Coverage    69.96%   70.05%   +0.08%     
===========================================
  Files          726      726              
  Lines        26978    26981       +3     
  Branches      4524     4520       -4     
===========================================
+ Hits         18875    18900      +25     
+ Misses        6831     6824       -7     
+ Partials      1272     1257      -15     

see 36 files with indirect coverage changes