Fixing broken returns

[john-science]

Description

A ton of our functions and methods have bad return statements, I am attempting to fix those here.

NOTE: This is a WIP, as I expect this to drop our code coverage a lot. And I need to see that code coverage difference and fix it in tests.

---

Checklist

• [X] This PR has only one purpose or idea.
• [x] Tests have been added/updated to verify that the new/changed code works.

• [X] The code style follows good practices.
• [X] The commit message(s) follow good practices.

• [X] The release notes are up-to-date with any bug fixes or new features.
• [X] The documentation is still up-to-date in the doc folder.
• [X] The dependencies are still up-to-date in setup.py.