Fix TODOs in code #917
Description
There are a few TODO comments in the code that I seem to have forgotten in some past issue, mostly refactoring stuff.
{{ message }}
There are a few TODO comments in the code that I seem to have forgotten in some past issue, mostly refactoring stuff.