Fix checkstyle
Make code uglier to keep PMD happy