DF#QCADOOMES-1974 Fixed some sonar and checkstyle problems.