GEOMETRY-63: fixing various PMD and SonarQube issues