tidy sonar suggestions