[REFACTOR] Inspect and improve code quality

[tommens]

** Issue **
The quality of the Java code has not been fully inspected. Use a code quality inspection tool like PMD or Sonar to suggest improvements to the code quality without affecting the existing behaviour of the code.