minor changes requested by sonar