Sonar inspired cleanup
FASTTRAVIS