Refactor: run PMD and apply some of the recommendations
8 files changed