Fixing up codestyle issues found within functional2 for later adding ruff formatter Change-Id: I0b280587c8243137184091a6d36df3dfe7568eb7
Resolves: #601 Change-Id: I79661e96149fa133fe003c698efb47f4c54bbf1a