fixup! fixup! fixup! fixup! Sonar inspired cleanup
fixup! fixup! fixup! fixup! fixup! Sonar inspired cleanup