Apply fixes from CodeFactor

Merged
CO
3mo ago
+268-533

This pull request applies fixes from code review by CodeFactor.


For more information, click here.