Made PMD, checkstyle etc. happier