DF Fixed some sonar and checkstyle bugs.