[BUG] Linting clean up

Now that the code has been flattened and purged of old code, now is the perfect time to clean up some of the linting issues in the codebase.

Best to review this PR commit by commit, will be much easier to do so.