PMD/style fixes.