lots of minor violation fixes as observed by Sonar, no new functionality