More sonar cleanup and line consolidation