Sonar inspired cleanup
FASTTRAVIS
fixup! Sonar inspired cleanup