diff --git a/src/main/java/azgracompress/cli/CliConstants.java b/src/main/java/azgracompress/cli/CliConstants.java
index e07700f69ea19777f40d393db4927d70af768a3d..586737b42eda2ea07d1ae3152e73edd291fe3555 100644
--- a/src/main/java/azgracompress/cli/CliConstants.java
+++ b/src/main/java/azgracompress/cli/CliConstants.java
@@ -56,9 +56,9 @@ public class CliConstants {
 
     @NotNull
     public static Options getOptions() {
-        Options options = new Options();
+        final Options options = new Options();
 
-        OptionGroup methodGroup = new OptionGroup();
+        final OptionGroup methodGroup = new OptionGroup();
         methodGroup.setRequired(true);
         methodGroup.addOption(new Option(CliConstants.COMPRESS_SHORT,
                                          CliConstants.COMPRESS_LONG,
@@ -90,7 +90,7 @@ public class CliConstants {
 
         methodGroup.addOption(new Option(CliConstants.HELP_SHORT, CliConstants.HELP_LONG, false, "Print help"));
 
-        OptionGroup compressionMethodGroup = new OptionGroup();
+        final OptionGroup compressionMethodGroup = new OptionGroup();
         compressionMethodGroup.addOption(createSQOption());
 
         compressionMethodGroup.addOption(createVQOption());
@@ -104,10 +104,7 @@ public class CliConstants {
                           false,
                           "Use middle plane for codebook creation");
 
-        options.addOption(new Option(CliConstants.VERBOSE_SHORT,
-                                     CliConstants.VERBOSE_LONG,
-                                     false,
-                                     "Make program verbose"));
+        options.addOption(createVerboseOption(false));
 
         options.addOption(new Option(CliConstants.WORKER_COUNT_SHORT,
                                      CliConstants.WORKER_COUNT_LONG,
@@ -145,4 +142,9 @@ public class CliConstants {
                           "Use vector quantization. Need to pass vector size eg. 9,9x1,3x3");
     }
 
+    public static Option createVerboseOption(final boolean onlyLongVersion) {
+        return onlyLongVersion
+                ? new Option(CliConstants.VERBOSE_LONG, false, "Make program verbose")
+                : new Option(CliConstants.VERBOSE_SHORT, CliConstants.VERBOSE_LONG, false, "Make program verbose");
+    }
 }
diff --git a/src/main/java/azgracompress/compression/VQImageCompressor.java b/src/main/java/azgracompress/compression/VQImageCompressor.java
index 4f6db44bc6cf5eceb31be14bd882b686174e1e2c..4652ee90cd02d112736bb9c0b2e57f00d0bda4cb 100644
--- a/src/main/java/azgracompress/compression/VQImageCompressor.java
+++ b/src/main/java/azgracompress/compression/VQImageCompressor.java
@@ -5,13 +5,15 @@ import azgracompress.cache.QuantizationCacheManager;
 import azgracompress.cache.VQCacheFile;
 import azgracompress.compression.exception.ImageCompressionException;
 import azgracompress.data.Range;
-import azgracompress.data.V3i;
 import azgracompress.fileformat.QuantizationType;
 import azgracompress.huffman.Huffman;
 import azgracompress.io.InputData;
 import azgracompress.io.loader.IPlaneLoader;
 import azgracompress.io.loader.PlaneLoaderFactory;
-import azgracompress.quantization.vector.*;
+import azgracompress.quantization.vector.LBGResult;
+import azgracompress.quantization.vector.LBGVectorQuantizer;
+import azgracompress.quantization.vector.VQCodebook;
+import azgracompress.quantization.vector.VectorQuantizer;
 import azgracompress.utilities.Stopwatch;
 import azgracompress.utilities.Utils;
 import org.jetbrains.annotations.NotNull;
@@ -330,7 +332,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
             }
 
             final int[] indices = quantizer.quantizeIntoIndices(voxelData, options.getWorkerCount());
-//            final int[] indices = quantizer.quantizeIntoIndicesUsingKDTree(voxelData, options.getWorkerCount());
+            // final int[] indices = quantizer.quantizeIntoIndicesUsingKDTree(voxelData, options.getWorkerCount());
             voxelLayersSizes[voxelLayerIndex] = writeHuffmanEncodedIndices(compressStream, huffman, indices);
             stopwatch.stop();
             if (options.isConsoleApplication()) {