Bug 563666 - Fixed some minor Sonar issues to improve code quality
3 files changed