Finish PR 44 - Remove Nested Tuple usage

[JordanMartinez]

Description of the change

Finishes #44 and resolves the merge conflict

---

Checklist:

• [x] Added the change to the changelog's "Unreleased" section with a link to this PR and your username
• [ ] Linked any existing issues or proposals that this pull request should close
• [ ] Updated or added relevant documentation in the README and/or documentation directory
• [ ] Added a test for the contribution (if applicable)