diff --git a/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java b/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java
index ceff27d6d..9085dc0f8 100755
--- a/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java
+++ b/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java
@@ -122,24 +122,20 @@ public static boolean parseCommandLine(String[] args)
 
 		for (int i = 0; i < args.length; i++) {
 			switch (state) {
-			case 0:
-
-				if (args[i].equals("--")) {
-					state = 1;
 
-					break;
-				}
+			case 0:
+                if (args[i].equals("--")) {
+                    state = 1;
+                    break;
+                }
 
-				if (args[i].startsWith("-")) {
+                if (args[i].startsWith("-")) {
 					if (args[i].equals("-d") || args[i].equals("--dbd-file")) { //dbd file
 						i++;
-
 						if (i >= args.length) {
 							System.err.println("Missing .dbd file name.");
-
 							return false;
 						}
-
 						dbdEntries.add(new DBDEntry(args[i]));
 						continue;
 					} else if (args[i].equals("--enable-capfast")) {
@@ -157,27 +153,23 @@ public static boolean parseCommandLine(String[] args)
 					} else if (args[i].equals("--disable-macro-warnings")) {
 						Settings.getInstance().setDisableMacroWarnings(true);
 						continue;							
+
 					} else if (args[i].equals("-h") || args[i].equals("--help")) {
 						printHelp();
-
 						return false;
-						
 					} else if (args[i].equals("-v")
 					    || args[i].equals("--version")) {
 						printVersion();
-
 						return false;
 					} else {
 						System.err.println("Invalid parameter: " + args[i]+"\n");
 						printHelp();
-						
 						return false;
 					}
 				}
+                // Intentionally no break here
 
-				break;  // unreachable, but makes static code analysis happy
-
-                        case 1:
+            case 1:
 				vdbFile = new File(args[i]);
 				state = 2;