address critical code quality issues

see the code quality report for details

remediate all issues with severity "blocker" and "critical"