FASTTRAVIS
fixup! Sonar inspired cleanup