Remerge Improve code based on mypy report

Ashwin Kumar Karnadrequested to merge
improve-code-based-on-mypy-report into main-before-mr10

Trying to recreate !10 (merged)

Edited by Ashwin Kumar Karnad

Merge request reports