diff --git a/src/main/java/com/nickmegistone/form/InitForm.java b/src/main/java/com/nickmegistone/form/InitForm.java
index 85bff32..f30640c 100644
--- a/src/main/java/com/nickmegistone/form/InitForm.java
+++ b/src/main/java/com/nickmegistone/form/InitForm.java
@@ -251,11 +251,7 @@ private void searchMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:even
         synchronized (lockConnection) {
             lockConnection.notifyAll();
         }
-        if (synthesizerIsSpeaking) {
-            signalSearch(SYNTHESIZER_IS_SPEAKING, false);
-        } else {
-            signalSearch(SEARCH_WHEN_CLICKED, true);
-        }
+        signalSearch(synthesizerIsSpeaking ? SYNTHESIZER_IS_SPEAKING : SEARCH_WHEN_CLICKED, !synthesizerIsSpeaking);
     }//GEN-LAST:event_searchMouseClicked
 
     private void formMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseClicked
diff --git a/src/main/java/com/nickmegistone/vocaliamaven/Vocalia.java b/src/main/java/com/nickmegistone/vocaliamaven/Vocalia.java
index 58c6b28..cf62ff3 100644
--- a/src/main/java/com/nickmegistone/vocaliamaven/Vocalia.java
+++ b/src/main/java/com/nickmegistone/vocaliamaven/Vocalia.java
@@ -12,7 +12,6 @@
 
 import static com.nickmegistone.apputils.AppUtils.*;
 
-// TODO: Add full docker support
 public class Vocalia extends javax.swing.JFrame {
 
     private final InitForm initForm;