Some more sonarLint fixes
4 files changed