improving based on sonar suggestions