- Fixed issues reported by Sonar.
- Refactoring.