Simplify sonar variables