DATACMNS-558 - Some code cleanups according to the Sonar report.