diff --git a/doc/README.read_password_from_file b/doc/README.read_password_from_file
index 3ed0781a69..09ea3dbc46 100644
--- a/doc/README.read_password_from_file
+++ b/doc/README.read_password_from_file
@@ -21,12 +21,12 @@ Document date:  2008-11-30
 
  All utilities have new switch 
 -fetch_password 
- which may be abbreviated according with ulitity rules. 
+ which may be abbreviated according with utility rules. 
  The exception is QLI, where -F should be used. 
  
  Switch has required parameter - name of file with password. I.e.: 
 isql -user sysdba -fet passfile server:employee 
- will load password form file "passfile", using it's first line 
+ will load password form file "passfile", using its first line 
  as password. 
  
  One can specify "stdin" as file name to make password be read 
diff --git a/src/burp/burpswi.h b/src/burp/burpswi.h
index f3349a16d6..54a09fb53a 100644
--- a/src/burp/burpswi.h
+++ b/src/burp/burpswi.h
@@ -91,7 +91,7 @@ const int IN_SW_BURP_TRUSTED_ROLE	= 42;      // use trusted role on attach
 const int IN_SW_BURP_FIX_FSS_DATA		= 43;      // fix unicode_fss data
 const int IN_SW_BURP_FIX_FSS_METADATA	= 44;      // fix unicode_fss metadata
 
-const int IN_SW_BURP_FETCHPASS		= 45;      // fetch default password to use on attach from file
+const int IN_SW_BURP_FETCHPASS		= 45;      // fetch default password from file to use on attach
 
 /**************************************************************************/
     // used 0BCDEFGILMNOPRSTUVYZ    available AHJQWX 
diff --git a/src/common/utils.cpp b/src/common/utils.cpp
index d19144e211..5a691504fc 100644
--- a/src/common/utils.cpp
+++ b/src/common/utils.cpp
@@ -688,7 +688,7 @@ namespace {
 	class FileClose
 	{
 	public:
-		static void clear(FILE *f)
+		static void clear(FILE* f)
 		{
 			if (f && f != stdin) {
 				fclose(f);
diff --git a/src/dudley/ddl.cpp b/src/dudley/ddl.cpp
index 467979aecc..752f1e268a 100644
--- a/src/dudley/ddl.cpp
+++ b/src/dudley/ddl.cpp
@@ -84,7 +84,7 @@ enum in_sw_values
 #ifdef TRUSTED_AUTH
 	IN_SW_GDEF_TRUSTED,		// trusted auth
 #endif
-	IN_SW_GDEF_FETCH_PASS,	// fetch password from file
+	IN_SW_GDEF_FETCH_PASS	// fetch password from file
 };
 
 static const in_sw_tab_t gdef_in_sw_table[] =
@@ -293,10 +293,9 @@ int CLIB_ROUTINE main( int argc, char* argv[])
 
 		case IN_SW_GDEF_FETCH_PASS:
 			if (argc > 1) {
-				if (fb_utils::fetchPassword(*++argv, dudleyGlob.DDL_default_password) 
-								!= fb_utils::FETCH_PASS_OK)
+				if (fb_utils::fetchPassword(*++argv, dudleyGlob.DDL_default_password) != fb_utils::FETCH_PASS_OK)
 				{
-					DDL_msg_put(345);	/* msg 4: gdef: Error fetching passwird from file */
+					DDL_msg_put(345);	// msg 4: gdef: Error fetching password from file
 					DDL_exit(FINI_ERROR);
 				}
 				argc--;
diff --git a/src/gpre/gpre.cpp b/src/gpre/gpre.cpp
index 8285eee766..8378a8e792 100644
--- a/src/gpre/gpre.cpp
+++ b/src/gpre/gpre.cpp
@@ -1915,10 +1915,9 @@ static bool get_switches(int			argc,
 			{
 				return false;
 			}
-			if (fb_utils::fetchPassword(*++argv, gpreGlob.default_password) != 
-						fb_utils::FETCH_PASS_OK)
+			if (fb_utils::fetchPassword(*++argv, gpreGlob.default_password) != fb_utils::FETCH_PASS_OK)
 			{
-				fprintf(stderr, "--fetch_password : error loading password from file\n ");
+				fprintf(stderr, "-fetch_password: error loading password from file\n ");
 			}
 			break;
 
diff --git a/src/include/fb_exception.h b/src/include/fb_exception.h
index 09560a625a..0af00d8b54 100644
--- a/src/include/fb_exception.h
+++ b/src/include/fb_exception.h
@@ -159,7 +159,7 @@ private:
 	void release_vector() throw();
 };
 
-// use this class if exception can be handled 
+// use this class if exception can be handled
 class system_error : public status_exception
 {
 private:
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
index 54930e252b..6f844de9e8 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -6838,7 +6838,7 @@ static processing_state parse_arg(int argc,
 
 				case SWITCH_FETCHPASS:
 				{
-					const char* pass = 0;
+					const char* pass = NULL;
 					fb_utils::FetchPassResult rez = fb_utils::fetchPassword(swarg_str, pass);
 					if (rez == fb_utils::FETCH_PASS_OK)
 					{