Code cleanup to resolve checkstyle warnings.