Fix SonarQube Findings

[scranford1]

Resolve the SonarQube findings, apologies in advance for size of PR. A lot of the changes are autoformatting taking over on saving files (let me know if you want me to remove them). Major changes are for cognitive complexity and splitting large functions into multiple pieces.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[jdw-creare]

Thanks Sam, this looks great!

I think this kind of change is exactly what SonarQube is encouraging to reduce cognitive complexity. I like how you picked sections of the long methods to break out into their own methods.

I think if you were adding a new chunk of code, I'd request some additional docstrings. But since this is meant to be a light-touch refactor, there's no need to go through the effort to sort those out. I"ll merge!

Thanks!