Various minor cleanup patches

[osander1]

No description provided.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.95%. Comparing base (6c58e40) to head (21894d4).
Report is 1 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master      #86   +/-   ##
=======================================
  Coverage   65.95%   65.95%           
=======================================
  Files          51       51           
  Lines       26473    26473           
  Branches     1843     1843           
=======================================
  Hits        17461    17461           
  Misses       9012     9012           

Flag	Coverage Δ
unittests	65.95% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.