Some minor changes to improve code quality (Sonar)
6 files changed