diff --git a/scst/include/backport.h b/scst/include/backport.h
index 5d06aa0f4..b0fbdb55a 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -1556,7 +1556,7 @@ typedef void (*rcu_callback_t)(struct rcu_head *);
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 ||	\
 	 RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 7)
 /*
- * See also commit 546a9d8519ed ("rcu: Export debug_init_rcu_head() and and
+ * See also commit 546a9d8519ed ("rcu: Export debug_init_rcu_head() and
  * debug_init_rcu_head()") # v3.16.
  */
 static inline void init_rcu_head(struct rcu_head *head) { }
diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index d8c9b1042..0ca327d05 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -742,8 +742,8 @@ enum scst_tg_sup {
 
 /*
  * Error code returned by target attribute sysfs methods if invoked after
- * scst_register_target() finished but before before scst_tgt_set_tgt_priv()
- * has been invoked.
+ * scst_register_target() finished but before scst_tgt_set_tgt_priv() has been
+ * invoked.
  */
 enum {
 	E_TGT_PRIV_NOT_YET_SET = EBUSY
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 29f75016b..2f969b669 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -6001,6 +6001,7 @@ ssize_t kernel_write(struct file *file, const void *buf, size_t count,
 {
 	mm_segment_t old_fs = get_fs();
 	ssize_t result;
+
 	set_fs(KERNEL_DS);
 	{
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
@@ -8189,7 +8190,7 @@ static struct request *blk_make_request(struct request_queue *q,
 			return ERR_PTR(ret);
 		}
 		/*
-		 * See also commit commit 0abc2a10389f ("block: fix
+		 * See also commit 0abc2a10389f ("block: fix
 		 * blk_rq_append_bio"). That commit has been backported to
 		 * kernel v4.14.11 as 88da02868f77.
 		 */