Fixed these classes to abide by checkstyle and PMD rules.