DF Some styling changes.
DF Fixed some sonar and checkstyle bugs.