* address checkstyle and PMD complaints