Some minor cleanups based on Checkstyle/Findbugs/PMD