diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
index e15440e1..78706646 100644
--- a/prog/sensord/rrd.c
+++ b/prog/sensord/rrd.c
@@ -99,7 +99,7 @@ static void rrdCheckLabel(const char *rawLabel, int index0)
 		} else {
 			buffer[i] = '_';
 		}
-		++ i;
+		++i;
 	}
 	buffer[i] = '\0';
 
@@ -108,7 +108,7 @@ static void rrdCheckLabel(const char *rawLabel, int index0)
 
 	/* locate duplicates */
 	while (okay && (j < index0))
-		okay = strcmp(rrdLabels[j ++], buffer);
+		okay = strcmp(rrdLabels[j++], buffer);
 
 	/* uniquify duplicate labels with _? or _?? */
 	while (!okay) {
@@ -449,13 +449,19 @@ int rrdCGI(void)
 {
 	int ret = 0, i;
 
-	printf("#!" RRDCGI "\n\n<HTML>\n<HEAD>\n<TITLE>sensord</TITLE>\n</HEAD>\n<BODY>\n<H1>sensord</H1>\n");
+	printf("#!" RRDCGI "\n\n<HTML>\n"
+	       "<HEAD>\n<TITLE>sensord</TITLE>\n</HEAD>\n"
+	       "<BODY>\n<H1>sensord</H1>\n");
+
 	for (i = 0; i < ARRAY_SIZE(graphs); i++) {
 		struct gr *graph = &graphs[i];
 
 		printf("<H2>%s</H2>\n", graph->h2);
-		printf("<P>\n<RRD::GRAPH %s/%s.png\n\t--imginfo '<IMG SRC=" WWWDIR "/%%s WIDTH=%%lu HEIGHT=%%lu>'\n\t-a PNG\n\t-h 200 -w 800\n",
+		printf("<P>\n<RRD::GRAPH %s/%s.png\n\t--imginfo '"
+		       "<IMG SRC=" WWWDIR "/%%s WIDTH=%%lu HEIGHT=%%lu>'"
+		       "\n\t-a PNG\n\t-h 200 -w 800\n",
 		       sensord_args.cgiDir, graph->image);
+
 		printf("\t--lazy\n\t-v '%s'\n\t-t '%s'\n\t-x '%s'\n\t%s",
 		       graph->axisTitle, graph->title, graph->axisDefn,
 		       graph->options);
@@ -469,7 +475,12 @@ int rrdCGI(void)
 			ret = rrdCGI_LINE(graph, LOADAVG, LOAD_AVERAGE, NULL);
 		printf (">\n</P>\n");
 	}
-	printf("<p>\n<small><b>sensord</b> by <a href=\"mailto:merlin@merlin.org\">Merlin Hughes</a>, all credit to the <a href=\"http://www.lm-sensors.org/\">lm_sensors</a> crew.</small>\n</p>\n");
+	printf("<p>\n<small><b>sensord</b> by "
+	       "<a href=\"mailto:merlin@merlin.org\">Merlin Hughes</a>"
+	       ", all credit to the "
+	       "<a href=\"http://www.lm-sensors.org/\">lm_sensors</a> "
+	       "crew.</small>\n</p>\n");
+
 	printf("</BODY>\n</HTML>\n");
 
 	return ret;