- Refactoring.
- Fixed issues reported by Sonar.