Code fix

Huy Phong Dangrequested to merge
Minor_fix into master

Finish fixing code smells based on SonarLint.

All tests passed.

Merge request reports