sonar told me to fix

fixed some convention sonar complained too much about.