diff --git a/src/cluster/cluster.cpp b/src/cluster/cluster.cpp
index 916fe8d93463477ad769bd1a0e60709a116a9bbe..a093e0c9a5eda818f12701d3fc355e5b7d32cb79 100644
--- a/src/cluster/cluster.cpp
+++ b/src/cluster/cluster.cpp
@@ -436,7 +436,8 @@ void cluster() {
 									if (phs > 360.0) phs -= 360.0;
 								}
 								// label 188
-								if (!((nks == 1 && jxi488 == 1) || jth486 > 1 || jph484 > 1)) {
+								bool goto190 = (nks == 1 && (jxi488 > 1 || jth486 > 1 || jph484 > 1));
+								if (!goto190) {
 									upvmp(ths, phs, icspnv, costs, sints, cosps, sinps, us, upsmp, unsmp);
 									if (isam >= 0)
 										wmamp(
@@ -793,14 +794,14 @@ void cluster() {
 										tqsv[2] = tqcs[ilr290 - 1][2];
 										double tep, ten, tek, tsp, tsn, tsk;
 										tqr(u, up, un, tqev, tqsv, tep, ten, tek, tsp, tsn, tsk);
-										fprintf(output, "   TQEl=%15.7lE, TQEr=%15.7lE, TQEk=%15.7lE\n", tep, ten, tek);
-										fprintf(output, "   TQSl=%15.7lE, TQSr=%15.7lE, TQSk=%15.7lE\n", tsp, tsn, tsk);
+										fprintf(output, "   TQEl=%15.7lE,  TQEr=%15.7lE,  TQEk=%15.7lE\n", tep, ten, tek);
+										fprintf(output, "   TQSl=%15.7lE,  TQSr=%15.7lE,  TQSk=%15.7lE\n", tsp, tsn, tsk);
 										fprintf(
-												output, "   TQEx=%15.7lE, TQEy=%15.7lE, TQEz=%15.7lE\n",
+												output, "   TQEx=%15.7lE,  TQEy=%15.7lE,  TQEz=%15.7lE\n",
 												tqce[ilr290 - 1][0], tqce[ilr290 - 1][1], tqce[ilr290 - 1][2]
 										);
 										fprintf(
-												output, "   TQSx=%15.7lE, TQSy=%15.7lE, TQSz=%15.7lE\n",
+												output, "   TQSx=%15.7lE,  TQSy=%15.7lE,  TQSz=%15.7lE\n",
 												tqcs[ilr290 - 1][0], tqcs[ilr290 - 1][1], tqcs[ilr290 - 1][2]
 										);
 									}
diff --git a/src/include/clu_subs.h b/src/include/clu_subs.h
index 3e6c9a393b909734d094bd8ec5e3d718221606b3..c025610ac01094cad4660ae0eeff6501f86a64ac 100644
--- a/src/include/clu_subs.h
+++ b/src/include/clu_subs.h
@@ -1432,7 +1432,7 @@ void pcros(double vk, double exri, C1 *c1, C1_AddOns *c1ao, C4 *c4) {
 	double cccs = ccs / exdc;
 	csam = -(ccs / (exri * vk)) * std::complex<double>(0.0, 0.5);
 	const double pi4sq = 64.0 * acos(0.0) * acos(0.0);
-	double cfsq =4.0 / (pi4sq *ccs * ccs);
+	double cfsq = 4.0 / (pi4sq *ccs * ccs);
 	const int nlemt = c4->nlem + c4->nlem;
 	int jpo = 2;
 	for (int ipo18 = 1; ipo18 <= 2; ipo18++) {
@@ -1455,7 +1455,7 @@ void pcros(double vk, double exri, C1 *c1, C1_AddOns *c1ao, C4 *c4) {
 				amp += (c1ao->am0m[i][j] * c1->w[j][jpo - 1]);
 			} // j10 loop
 			sum += (dconjg(am) * am).real();
-			sump += (dconjg(amp) * amp);
+			sump += (dconjg(amp) * am);
 			sum1 += (dconjg(c1->w[i][ipo18 - 1]) * am);
 			sum2 += (dconjg(c1->w[i][jpo - 1]) * am);
 			sum3 += (c1->w[i][ipopt - 1] * am);