[FIX] Some Checkstyle fixes.