Resolve cognitive complexity issues in this file.

Re-write to leverage classes and utilties from structures.py, and ensure test fixtures adequately cover this method.