Several code complexity fixes#4822

nilsteampassnet wants to merge 2 commits into

masternilsteampassnet/TeamPass:masterfrom

hotfix/fix_complexitynilsteampassnet/TeamPass:hotfix/fix_complexityCopy head branch name to clipboard