Some style fixes
PMD fix