Addressed remaining lint, checkstyle errors.