Merge "Fix code smells based on SonarCloud report"