- Fixes PMD and FindBugs errors