Minor improvements
Remove unnecessary injection
Merge branch 'sonar'