fixup! Sonar inspired cleanup