diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserAIS.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserAIS.java
index 46879ae..46eee68 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserAIS.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserAIS.java
@@ -215,7 +215,7 @@ public class AutoAnalyserAIS extends AutoAnalyser {
 		pythonCode.append("\n");
 		pythonCode.append("# Compute for all variables:\n");
 		pythonCode.append("for v in range(" + dataColumns + "):\n");
-		String pythonPrefix = "\t";
+		String pythonPrefix = "    ";
 		pythonCode.append(pythonPrefix+ "# For each variable:\n");
 		// 3. Matlab code
 		matlabCode.append("\n");
diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCMI.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCMI.java
index 7c5a173..4eb12db 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCMI.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCMI.java
@@ -191,11 +191,11 @@ public class AutoAnalyserCMI extends AutoAnalyser
 		pythonCode.append("c = " + conditional + "\n");
 		pythonCode.append("# Compute for all pairs:\n");
 		pythonCode.append("for s in range(" + dataColumns + "):\n");
-		pythonCode.append("\tfor d in range(" + dataColumns + "):\n");
-		String pythonPrefix = "\t\t";
+		pythonCode.append("    for d in range(" + dataColumns + "):\n");
+		String pythonPrefix = "        ";
 		pythonCode.append(pythonPrefix+ "# For each source-dest pair (given conditional):\n");
 		pythonCode.append(pythonPrefix + "if ((s == d) or (s == c) or (d == c)):\n");
-		pythonCode.append(pythonPrefix + "\tcontinue\n");
+		pythonCode.append(pythonPrefix + "    continue\n");
 		// 3. Matlab code
 		matlabCode.append("\n");
 		matlabCode.append("c = " + (conditional+1) + ";\n");
diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCTE.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCTE.java
index 915e068..9c4161a 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCTE.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserCTE.java
@@ -216,11 +216,11 @@ public class AutoAnalyserCTE extends AutoAnalyser
 		pythonCode.append("c = " + conditional + "\n");
 		pythonCode.append("# Compute for all pairs:\n");
 		pythonCode.append("for s in range(" + dataColumns + "):\n");
-		pythonCode.append("\tfor d in range(" + dataColumns + "):\n");
-		String pythonPrefix = "\t\t";
+		pythonCode.append("    for d in range(" + dataColumns + "):\n");
+		String pythonPrefix = "        ";
 		pythonCode.append(pythonPrefix+ "# For each source-dest pair (given conditional):\n");
 		pythonCode.append(pythonPrefix + "if ((s == d) or (s == c) or (d == c)):\n");
-		pythonCode.append(pythonPrefix + "\tcontinue\n");
+		pythonCode.append(pythonPrefix + "    continue\n");
 		// 3. Matlab code
 		matlabCode.append("\n");
 		matlabCode.append("c = " + (conditional+1) + ";\n");
diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserChannelCalculator.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserChannelCalculator.java
index d365b90..e53fd69 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserChannelCalculator.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserChannelCalculator.java
@@ -99,11 +99,11 @@ public abstract class AutoAnalyserChannelCalculator extends AutoAnalyser {
 		pythonCode.append("\n");
 		pythonCode.append("# Compute for all pairs:\n");
 		pythonCode.append("for s in range(" + dataColumns + "):\n");
-		pythonCode.append("\tfor d in range(" + dataColumns + "):\n");
-		String pythonPrefix = "\t\t";
+		pythonCode.append("    for d in range(" + dataColumns + "):\n");
+		String pythonPrefix = "        ";
 		pythonCode.append(pythonPrefix+ "# For each source-dest pair:\n");
 		pythonCode.append(pythonPrefix + "if (s == d):\n");
-		pythonCode.append(pythonPrefix + "\tcontinue\n");
+		pythonCode.append(pythonPrefix + "    continue\n");
 		// 3. Matlab code
 		matlabCode.append("\n");
 		matlabCode.append("% Compute for all pairs:\n");
diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserEntropy.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserEntropy.java
index 3131cae..5e8ac79 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserEntropy.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyserEntropy.java
@@ -162,7 +162,7 @@ public class AutoAnalyserEntropy extends AutoAnalyser {
 		pythonCode.append("\n");
 		pythonCode.append("# Compute for all variables:\n");
 		pythonCode.append("for v in range(" + dataColumns + "):\n");
-		String pythonPrefix = "\t";
+		String pythonPrefix = "    ";
 		pythonCode.append(pythonPrefix+ "# For each variable:\n");
 		// 3. Matlab code
 		matlabCode.append("\n");