diff --git a/src/global.c b/src/global.c
index 8af2b724a922372060d8a4184dc6ff58e308606b..3f9947e2399946f1277bfc0405fb7407c834bb18 100644
--- a/src/global.c
+++ b/src/global.c
@@ -214,8 +214,7 @@ bool curses_ended = FALSE;
 	 * statusbar. */
 
 char *homedir = NULL;
-		/* The user's home directory, from $HOME or
-		 * /etc/passwd. */
+	/* The user's home directory, from $HOME or /etc/passwd. */
 
 /* Return the number of entries in the shortcut list s. */
 size_t length_of_list(const shortcut *s)
diff --git a/src/nano.h b/src/nano.h
index d237a8a925ce586199c2cd49935aeded40bed12c..18c9032cd4ea6580210482ddf65e0392bcc60ebb 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -79,6 +79,7 @@
 #endif /* CURSES_H */
 
 #ifdef ENABLE_NLS
+/* Native language support. */
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
diff --git a/src/prompt.c b/src/prompt.c
index 01ec2957f8194e8400b5f3139890c16ed2e12ddb..31016349737875d64adc7ff8e64a575945ea8e53 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -28,15 +28,14 @@
 #include <string.h>
 
 static char *prompt = NULL;
-				/* The prompt string for statusbar
-				 * questions. */
+	/* The prompt string for statusbar questions. */
 static size_t statusbar_x = (size_t)-1;
-				/* The cursor position in answer. */
+	/* The cursor position in answer. */
 static size_t statusbar_pww = (size_t)-1;
-				/* The place we want in answer. */
+	/* The place we want in answer. */
 static bool reset_statusbar_x = FALSE;
-				/* Should we reset the cursor position
-				 * at the statusbar prompt? */
+	/* Should we reset the cursor position at the statusbar
+	 * prompt? */
 
 /* Read in a character, interpret it as a shortcut or toggle if
  * necessary, and return it.  Set meta_key to TRUE if the character is a
diff --git a/src/winio.c b/src/winio.c
index 77accad8adbf309693a723784d5b5aeed9a9f11c..3012026c14c1ef45add14d69f2563f30f2c87a51 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -30,19 +30,16 @@
 #include <ctype.h>
 
 static int *key_buffer = NULL;
-				/* The default keystroke buffer,
-				 * containing all the keystrokes we have
-				 * at a given point. */
+	/* The default keystroke buffer, containing all the keystrokes
+	 * we have at a given point. */
 static size_t key_buffer_len = 0;
-				/* The length of the default keystroke
-				 * buffer. */
+	/* The length of the default keystroke buffer. */
 static int statusblank = 0;
-				/* The number of keystrokes left after
-				 * we call statusbar(), before we
-				 * actually blank the statusbar. */
+	/* The number of keystrokes left after we call statusbar(),
+	 * before we actually blank the statusbar. */
 static bool disable_cursorpos = FALSE;
-				/* Should we temporarily disable
-				 * constant cursor position display? */
+	/* Should we temporarily disable constant cursor position
+	 * display? */
 
 /* Control character compatibility:
  *