fixup! Sonar inspired cleanup
Update dependencies