diff --git a/src/jrd/DebugInterface.h b/src/jrd/DebugInterface.h
index fb12db8812..cbd28b30bc 100644
--- a/src/jrd/DebugInterface.h
+++ b/src/jrd/DebugInterface.h
@@ -70,8 +70,8 @@ struct ArgumentInfo
 	{
 		if (type == x.type)
 			return index > x.index;
-		else
-			return type > x.type;
+
+		return type > x.type;
 	}
 };
 
diff --git a/src/jrd/exe.h b/src/jrd/exe.h
index e2375f9b0f..33d04bf91f 100644
--- a/src/jrd/exe.h
+++ b/src/jrd/exe.h
@@ -136,7 +136,7 @@ public:
 	bool		rse_writelock;
 	RecordSource*	rse_rsb;
 	jrd_nod*	rse_first;
-    jrd_nod*	rse_skip;
+	jrd_nod*	rse_skip;
 	jrd_nod*	rse_boolean;
 	jrd_nod*	rse_sorted;
 	jrd_nod*	rse_projection;
@@ -644,11 +644,11 @@ struct Item
 		{
 			if (subType == x.subType)
 				return index > x.index;
-			else
-				return subType > x.subType;
+
+			return subType > x.subType;
 		}
-		else
-            return type > x.type;
+
+		return type > x.type;
 	}
 };
 
@@ -768,7 +768,7 @@ public:
 	ResourceList	csb_resources;		/* Resources (relations and indexes) */
 	NodeStack		csb_dependencies;	/* objects this request depends upon */
 	Firebird::Array<RecordSource*> csb_fors;	/* stack of fors */
-    Firebird::Array<jrd_nod*> csb_exec_sta;		// Array of exec_into nodes
+	Firebird::Array<jrd_nod*> csb_exec_sta;		// Array of exec_into nodes
 	Firebird::Array<jrd_nod*> csb_invariants;	/* stack of invariant nodes */
 	Firebird::Array<jrd_node_base*> csb_current_nodes;	/* RecordSelExpr's and other invariant candidates within whose scope we are */
 #ifdef SCROLLABLE_CURSORS
@@ -786,7 +786,7 @@ public:
 	MapItemInfo			csb_map_item_info;		// Map item to item info
 	Firebird::MetaName	csb_domain_validation;	// Parsing domain constraint in PSQL
 
-    struct csb_repeat
+	struct csb_repeat
 	{
 		// We must zero-initialize this one
 		csb_repeat()
@@ -866,9 +866,9 @@ struct xcp_repeat {
 
 class PsqlException : public pool_alloc_rpt<xcp_repeat, type_xcp>
 {
-    public:
+public:
 	SLONG xcp_count;
-    xcp_repeat xcp_rpt[1];
+	xcp_repeat xcp_rpt[1];
 };
 
 const int xcp_sql_code	= 1;
diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp
index be13960c7e..f8999dd2ac 100644
--- a/src/jrd/gds.cpp
+++ b/src/jrd/gds.cpp
@@ -3074,9 +3074,7 @@ static int blr_print_dtype(gds_ctl* control)
 			// 0 = TYPE OF; 1 = full domain
 			blr_print_byte(control);
 
-			UCHAR n = blr_print_byte(control);
-
-			while (n-- > 0)
+			for (UCHAR n = blr_print_byte(control); n > 0; --n)
 				blr_print_char(control);
 
 			if (dtype == blr_domain_name2)
diff --git a/src/jrd/req.h b/src/jrd/req.h
index edcba344b3..b13fdf148f 100644
--- a/src/jrd/req.h
+++ b/src/jrd/req.h
@@ -153,7 +153,7 @@ const UCHAR REC_new_version	= 4;		/* savepoint created new record version and de
 
 class SaveRecordParam : public pool_alloc<type_srpb>
 {
-    public:
+public:
 	record_param srpb_rpb[1];		/* record parameter blocks */
 };
 
@@ -280,7 +280,7 @@ public:
 		req_unwind
 	} req_operation;				/* operation for next node */
 
-    StatusXcp req_last_xcp;			/* last known exception */
+	StatusXcp req_last_xcp;			/* last known exception */
 
 	record_param req_rpb[1];		/* record parameter blocks */
 };
@@ -337,7 +337,7 @@ enum {
 
 class IndexLock : public pool_alloc<type_idl>
 {
-    public:
+public:
 	IndexLock*	idl_next;		/* Next index lock block for relation */
 	Lock*		idl_lock;		/* Lock block */
 	jrd_rel*	idl_relation;	/* Parent relation */