diff --git a/ChangeLog b/ChangeLog
index 2e5b2efd4a9b9440360835448d7044321547efae..0d2e57dc0e3035859adc789e03e50b39fdf23e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-06-09  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/*.c: Cosmetic tweaks of comments and whitespace.
+
 2014-06-09  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c (do_input): Remove two superfluous false conditions.
 	* src/nano.h, src/text.c (add_undo): Avoid a compiler warning with
diff --git a/src/files.c b/src/files.c
index e18c0257fa4f2b0e5df5bca5904ca04bbf4a78e6..4ad96dbca543e1dfcca860af6d67adc745369ae3 100644
--- a/src/files.c
+++ b/src/files.c
@@ -478,7 +478,7 @@ bool close_buffer(void)
 	return FALSE;
 
 #if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
-        update_poshistory(openfile->filename, openfile->current->lineno, xplustabs()+1);
+    update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
 #endif
 
     /* Switch to the next file buffer. */
diff --git a/src/global.c b/src/global.c
index a45983c18704e42be85817e218f168ab34aa4c9f..042d58211fff768f814f1d1fc540a40c6ba13264 100644
--- a/src/global.c
+++ b/src/global.c
@@ -388,7 +388,7 @@ void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
 
 /* Return the given menu's first shortcut sequence, or the default value
  * (2nd arg).  Assumes currmenu for the menu to check. */
-int sc_seq_or (void (*func)(void), int defaultval)
+int sc_seq_or(void (*func)(void), int defaultval)
 {
     const sc *s = first_sc_for(currmenu, func);
 
diff --git a/src/move.c b/src/move.c
index 9d73f97f95f5a17c5c2980203552b1155492966b..a6a2bfc6bce497064b2d6b9eed1eaf8cd18cdfbd 100644
--- a/src/move.c
+++ b/src/move.c
@@ -63,7 +63,6 @@ void do_page_up(void)
 
     /* If we're not in smooth scrolling mode, put the cursor at the
      * beginning of the top line of the edit window, as Pico does. */
-
 #ifndef NANO_TINY
     if (!ISSET(SMOOTH_SCROLL)) {
 #endif
diff --git a/src/nano.c b/src/nano.c
index 70e9049f5ae79e4f41614c30d6362b475f9d47d0..c82806de8a54dc175b88109192e83017094bcd56 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2495,7 +2495,7 @@ int main(int argc, char **argv)
 
 #ifndef DISABLE_WRAPPING
     /* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root
-       if a --fill option was given on the command line. */
+     * if a --fill option was given on the command line. */
     if (fill_used)
 	UNSET(NO_WRAP);
 #endif
diff --git a/src/utils.c b/src/utils.c
index de565e897d9924bb9f6549d28d35cb7cf0089310..18f870afd30aa00d91bb8c0a662d35fe144e596f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -72,8 +72,8 @@ bool parse_num(const char *str, ssize_t *val)
 
     assert(str != NULL);
 
-    /* Man page for strtol() says this is required, and
-       it looks like it is! */
+    /* The manual page for strtol() says this is required, and
+     * it looks like it is! */
     errno = 0;
 
     j = (ssize_t)strtol(str, &first_error, 10);
diff --git a/src/winio.c b/src/winio.c
index b5a66149c35b6e29078715513a1d1aa695c319db..0e282d2c7707f3a5482339e4307fd92943659db7 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2889,10 +2889,9 @@ int update_line(filestruct *fileptr, size_t index)
 
 #ifdef DEBUG
     if (ISSET(SOFTWRAP) && strlen(converted) >= COLS - 2)
-	    fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
+	fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
 #endif
 
-
     /* Paint the line. */
     edit_draw(fileptr, converted, line, page_start);
     free(converted);
@@ -2907,7 +2906,7 @@ int update_line(filestruct *fileptr, size_t index)
 	for (index += COLS; index <= full_length && line < editwinrows; index += COLS) {
 	    line++;
 #ifdef DEBUG
-	    fprintf(stderr, "update_line(): Softwrap code, moving to %d index %lu\n", line, (unsigned long) index);
+	    fprintf(stderr, "update_line(): Softwrap code, moving to %d index %lu\n", line, (unsigned long)index);
 #endif
 	    blank_line(edit, line, 0, COLS);