Clean code

requested review from @basekeet

added 17 commits

• 6f6234fd...983fbf35 - 16 commits from branch main
• 73e65e9c - Merge branch 'main' into 'Clean_Code'

Compare with previous version

mentioned in commit 1b876df5

merged