diff --git a/ChangeLog b/ChangeLog
index 0e940f7f346afb7e0d350e93cf981aff78a50a21..def528111ee04cec1423613be93306ed06fe5f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -199,9 +199,11 @@ CVS code -
 	- Move here from nano.c, as they're movement functions, and also
 	  make them call check_statusblank().
 - nano.c:
-  move_to_filestruct(), copy_from_filestruct()
+  move_to_filestruct()
 	- Fix problem where edittop wouldn't be reset properly if it was
 	  inside the text moved to another filestruct. (DLR)
+  copy_from_filestruct()
+	- Miscellaneous cleanups. (DLR)
   usage()
 	- Properly mention the support for "[+LINE,COLUMN]" on the
 	  command line when HAVE_GETOPT_LONG isn't defined. (DLR)
diff --git a/src/nano.c b/src/nano.c
index ff01f52f920048acf2ce31a45a909aa930f8146e..e5a6f2ecdd69a2b9771ab12bc36ff901bfe4d4dd 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -49,12 +49,12 @@
 #include <setjmp.h>
 #endif
 
-static struct termios oldterm;	/* The user's original term settings */
-static struct sigaction act;	/* For all our fun signal handlers */
+static struct termios oldterm;	/* The user's original term settings. */
+static struct sigaction act;	/* For all our fun signal handlers. */
 
 #ifndef NANO_SMALL
 static sigjmp_buf jmpbuf;	/* Used to return to main() after a
-				   SIGWINCH. */
+				 * SIGWINCH. */
 #endif
 
 /* Create a new filestruct node.  Note that we specifically do not set