Fixing some Sonar bugs and reformatting code.
Removing unnecessary modifiers
Fixing path for JaCoCo reports.