sonar suggestion cleanup