Misc Improvements for a healthier codebase

[denysvitali]

Description

Just a few improvements for a healthier codebase. Mostly cosmetic stuff but there were a few small bugs.

Type of change

Please select all options that apply to this change:

• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Bug fix (non-breaking change which fixes an issue)
• Documentation update

Checklist:

Confirm you have completed the following steps:

• My code follows the style of this project.
• I have performed a self-review of my code.
• I have made corresponding updates to the documentation.
• I have added/updated unit tests to cover my changes.
• I have added/updated integration tests to cover my changes.

[denysvitali]

Friendly ping @aaronpkahn