fix: Sonar issues: Always use curly braces for if/else/for/while/do statements