diff --git a/exec.c b/exec.c
index 7e7acade9..d36209719 100644
--- a/exec.c
+++ b/exec.c
@@ -1324,8 +1324,6 @@ void exec( job_t *j )
 					( !sb_err->used ) &&
 					( !p->next );
 	
-				int has_file_redirect = 0;
-				
 				/*
 				  If the output of a builtin is to be sent to an internal
 				  buffer, there is no need to fork. This helps out the
diff --git a/fish_indent.c b/fish_indent.c
index 35bd24e45..e6a3f19ae 100644
--- a/fish_indent.c
+++ b/fish_indent.c
@@ -145,7 +145,7 @@ static int indent( string_buffer_t *out, wchar_t *in, int flags )
 
 			case TOK_PIPE:
 			{
-				sb_append( out, L"| " );
+				sb_append( out, L" | " );
 				is_command = 1;
 				break;
 			}
@@ -202,7 +202,7 @@ static int indent( string_buffer_t *out, wchar_t *in, int flags )
 			
 			default:
 			{
-				debug( 0, L"Unknown wha? %ls", last );
+				debug( 0, L"Unknown token '%ls'", last );
 				exit(1);
 			}			
 		}
@@ -282,10 +282,10 @@ int main( int argc, char **argv )
 		int opt_index = 0;
 		
 		int opt = getopt_long( argc,
-							   argv, 
-							   GETOPT_STRING,
-							   long_options, 
-							   &opt_index );
+				       argv, 
+				       GETOPT_STRING,
+				       long_options, 
+				       &opt_index );
 		
 		if( opt == -1 )
 			break;
diff --git a/highlight.c b/highlight.c
index f09ff805f..b4255aad9 100644
--- a/highlight.c
+++ b/highlight.c
@@ -42,10 +42,9 @@
 #define VAR_COUNT ( sizeof(highlight_var)/sizeof(wchar_t *) )
 
 static void highlight_universal_internal( wchar_t * buff, 
-										  int *color, 
-										  int pos, 
-										  array_list_t *error );
-
+					  int *color, 
+					  int pos, 
+					  array_list_t *error );
 
 /**
    The environment variables used to specify the color of different tokens.
diff --git a/input.c b/input.c
index e4b7c314f..f7a1d1d35 100644
--- a/input.c
+++ b/input.c
@@ -1,5 +1,5 @@
 /** \file input.c
-a	
+
 Functions for reading a character of input from stdin, using the
 inputrc information for key bindings.