fixup! fixup! fixup! fixup! Sonar inspired cleanup