diff --git a/builtin.c b/builtin.c
index 662a25285..7cc22bb44 100644
--- a/builtin.c
+++ b/builtin.c
@@ -277,13 +277,9 @@ static int builtin_block( wchar_t **argv )
 	;
 
 	int scope=UNSET;
-	
 	int erase = 0;
-	
 	int argc=builtin_count_args( argv );
-	
-	int type = (1<<EVENT_ANY);
-	
+	int type = (1<<EVENT_ANY);	
 
 	woptind=0;
 
@@ -645,7 +641,7 @@ static int builtin_exec( wchar_t **argv )
 }
 
 /**
-   Print the definitions of the given function to sb_out
+   Print the definition of the given function to sb_out
    stringbuffer. Used by the functions builtin.
 */
 static void functions_def( wchar_t *name )
@@ -910,7 +906,7 @@ static int builtin_functions( wchar_t **argv )
 							(void *)0 );			
 			}
 		}
-		
+
 		free( names_arr );
 		al_destroy( &names );			
 		return 0;
@@ -932,16 +928,14 @@ static int builtin_functions( wchar_t **argv )
 			for( i=0; i<al_get_count( &names ); i++ )
 			{
 				functions_def( names_arr[i] );
-				
 			}
 			free( names_arr );
 			al_destroy( &names );			
 			break;
 		}
-		
+
 		default:
 		{
-			
 			for( i=woptind; i<argc; i++ )
 			{
 				if( !function_exists( argv[i] ) )
@@ -951,23 +945,19 @@ static int builtin_functions( wchar_t **argv )
 					functions_def( argv[i] );
 				}
 			}
-			
-			
+
 			break;
 		}
 	}
 	return res;
 	
-	
 }
 
 /**
    Test whether the specified string is a valid name for a keybinding
 */
 static int wcsbindingname( wchar_t *str )
-{
-	
-	
+{	
 	while( *str )
 	{
 		if( (!iswalnum(*str)) && (*str != L'-' ) )
@@ -1062,10 +1052,9 @@ static int builtin_function( wchar_t **argv )
                            argv[0],
                            long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
-				
+
 				res = 1;
-				break;
-				
+				break;			
 				
 			case 'd':		
 				desc=woptarg;				
diff --git a/env.c b/env.c
index d6334e68c..4097f729e 100644
--- a/env.c
+++ b/env.c
@@ -305,7 +305,7 @@ static void handle_locale()
 			++_nl_msg_cat_cntr;
 		}
 #elif HAVE_DCGETTEXT
-		dcgettext("fish","",LC_MESSAGES);
+		dcgettext("fish","Changing language to English",LC_MESSAGES);
 #endif		
 
 		if( is_interactive )