refs #87 fixed some sonar issues