Cleaned Sonar Class