Fix various code issues and clean up imports#2

YousefAliUK wants to merge 2 commits intozonetecde:mainzonetecde/random-github-repo-2:mainfrom

YousefAliUK:fix/code-quality-improvementsYousefAliUK/random-github-repo-2:fix/code-quality-improvementsCopy head branch name to clipboard