chore: implement audit maintainability recommendations#1188

BigSimmo wants to merge 3 commits into

mainBigSimmo/Database:mainfrom

execute-audit-remediation-planBigSimmo/Database:execute-audit-remediation-planCopy head branch name to clipboard