Code cleanup, small coverage boost

[alessio]

• Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
• Wrote tests
• Updated relevant documentation (docs/)
• Added entries in PENDING.md with issue #
• rereviewed Files changed in the github PR explorer

---

For Admin Use:

• Added appropriate labels to PR (ex. wip, ready-for-review, docs)
• Reviewers Assigned
• Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

[codecov]

Codecov Report

Merging #3551 into develop will increase coverage by 2.93%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #3551      +/-   ##
===========================================
+ Coverage     57.1%   60.03%   +2.93%     
===========================================
  Files          179      131      -48     
  Lines        14168     9640    -4528     
===========================================
- Hits          8090     5787    -2303     
+ Misses        5597     3509    -2088     
+ Partials       481      344     -137

[jackzampolin]

LGTM 👍