diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
index 20012cbc0..4737696da 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
@@ -18,8 +18,6 @@ package org.jackhuang.hellominecraft.launcher;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java
index 6109b30fc..867829f94 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/MinecraftCrashAdvicer.java
@@ -30,23 +30,8 @@ public final class MinecraftCrashAdvicer {
     }
     
     public static String getAdvice(String trace, boolean selfCrash) {
-        /*if (t.getCause() instanceof UnsupportedClassVersionError) {
-            return C.i18n("crash.advice.UnsupportedClassVersionError");
-        } else if (t instanceof ConcurrentModificationException) {
-            return C.i18n("crash.advice.ConcurrentModificationException");
-        } else if (t instanceof SecurityException) {
-            return C.i18n("crash.advice.SecurityException");
-        } else if (t instanceof InvocationTargetException) {
-            return C.i18n("crash.advice.InvocationTargetException");
-        } else if (t instanceof NoSuchFieldError || (t.getCause() != null && t.getCause() instanceof NoSuchFieldException)) {
-            return C.i18n("crash.advice.NoSuchFieldError");
-        } else if (t instanceof NoClassDefFoundError || t instanceof ClassNotFoundException || (t.getCause() != null && t.getCause() instanceof ClassNotFoundException)) {
-            return C.i18n("crash.advice.ClassNotFondException");
-        }*/
-        
-        if (trace.contains("LWJGLException")) {
-            if(trace.contains("Pixel format not accelerated"))
-                return C.i18n("crash.advice.LWJGLException");
+        if(trace.contains("Pixel format not accelerated")) {
+            return C.i18n("crash.advice.LWJGLException");
         } else if (trace.contains("UnsupportedClassVersionError")) {
             return C.i18n("crash.advice.UnsupportedClassVersionError");
         } else if (trace.contains("ConcurrentModificationException")) {
@@ -56,13 +41,13 @@ public final class MinecraftCrashAdvicer {
         } else if (trace.contains("NoSuchFieldException") || trace.contains("NoSuchFieldError")) {
             return C.i18n("crash.advice.NoSuchFieldError");
         } else if (trace.contains("NoClassDefFoundError") || trace.contains("ClassNotFoundException")) {
-            return C.i18n("crash.advice.ClassNotFondException");
+            return C.i18n("crash.advice.ClassNotFoundException");
         } else if (trace.contains("no lwjgl in java.library.path")) {
             return C.i18n("crash.advice.no_lwjgl");
         } else if (trace.contains("OpenGL") || trace.contains("OpenAL")) {
             return C.i18n("crash.advice.OpenGL");
         }
-        return selfCrash ? C.i18n("crash.advice.no") : C.i18n("crash.advice.otherwise");
+        return C.i18n(selfCrash ? "crash.advice.no" : "crash.advice.otherwise");
     }
 
 }
diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java
index dac28e432..a3c21314b 100644
--- a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java
+++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/tasks/TaskWindow.java
@@ -170,7 +170,7 @@ public class TaskWindow extends javax.swing.JDialog
     }// </editor-fold>//GEN-END:initComponents
 
     private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
-        if(MessageBox.Show(C.i18n("operation.confirm_stop"), MessageBox.YES_OPTION) == MessageBox.YES_OPTION)
+        if(MessageBox.Show(C.i18n("operation.confirm_stop"), MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION)
             this.dispose();
     }//GEN-LAST:event_btnCancelActionPerformed
 
@@ -181,12 +181,7 @@ public class TaskWindow extends javax.swing.JDialog
         }
 
         if (!suc) {
-            EventQueue.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    taskList.abort();
-                }
-            });
+            EventQueue.invokeLater(taskList::abort);
             HMCLog.log("Tasks have been canceled by user.");
         }
     }//GEN-LAST:event_formWindowClosed