Reapplying Checkstyle suggestions.