fix: Sonar issue and coding style