refactor: Code cleanup Pt4#40

Ninerian wants to merge 3 commits intocode-cleanup-pt2Staffbase/plugins-sdk-php:code-cleanup-pt2from

code-cleanup-pt4Staffbase/plugins-sdk-php:code-cleanup-pt4Copy head branch name to clipboard