Sonar reported issues reduced to zero. Code review suggestions implemented.