diff --git a/EDSSharp/Program.cs b/EDSSharp/Program.cs
index a8b783a8..bba0349a 100644
--- a/EDSSharp/Program.cs
+++ b/EDSSharp/Program.cs
@@ -20,26 +20,20 @@ static void Main(string[] args)
 
                 Dictionary<string, string> argskvp = new Dictionary<string, string>();
 
-                int argv = 0;
-
-                for (argv = 0; argv < (args.Length - 1); argv++)
+                for (int argv = 0; argv < (args.Length - 1); argv++)
                 {
                     if (args[argv] == "--infile")
                     {
-                        argskvp.Add("--infile", args[argv + 1]);
+                        argskvp.Add("--infile", args[++argv]);
                     }
-
-                    if (args[argv] == "--outfile")
+                    else if (args[argv] == "--outfile")
                     {
-                        argskvp.Add("--outfile", args[argv + 1]);
+                        argskvp.Add("--outfile", args[++argv]);
                     }
-
-                    if (args[argv] == "--type")
+                    else if (args[argv] == "--type")
                     {
-                        argskvp.Add("--type", args[argv + 1]);
+                        argskvp.Add("--type", args[++argv]);
                     }
-
-                    argv++;
                 }
 
 
@@ -88,7 +82,6 @@ static void Main(string[] args)
 
         private static void openEDSfile(string infile)
         {
-          
             eds.Loadfile(infile);
         }