pmd: code cleanups - no functional change
 * checkstyle and pmd dogfood