Fix #218, #56 - Resolve static analysis warnings

[skliper]

Checklist (Please check before submitting)

• [x] I reviewed the Contributing Guide.
• [x] I signed and emailed the appropriate Contributor License agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

• Fix #56
• Fix #218

Testing performed Build/unit test and run static analysis

Expected behavior changes None, just cleaned up about half the static analysis warnings

System(s) tested on

• Hardware: i5/wsl
• OS: Ubuntu 18.04
• Versions: Bundle main + this commit

Additional context Note goto removal issue is still open which would address another significant set of warnings (#225)

Third party code None

Contributor Info - All information REQUIRED for consideration of pull request Jacob Hageman - NASA/GSFC

[astrogeco]

CCB:2022-04-13 APPROVED