diff --git a/lib/comp.c b/lib/comp.c
index b4ef56f..ed4afe3 100644
--- a/lib/comp.c
+++ b/lib/comp.c
@@ -33,7 +33,7 @@ enum
 	VAR_INST, /* instance variable */
 	VAR_CLASS_I, /* class variable in class initialization scope */
 	VAR_CLASS_CM, /* class variable in class method scope */
-	VAR_CLASS_IM, /* class variable in instance method scope */
+	VAR_CLASS_IM /* class variable in instance method scope */
 };
 
 enum
@@ -381,7 +381,7 @@ HCL_INFO2 (hcl, "CLASS NAMED VAR [%.*js]\n", name->len, name->ptr);
 			vi->type = VAR_INDEXED;
 			vi->ctx_offset = hcl->c->fnblk.depth - i; /* context offset */
 			vi->index_in_ctx = index;
-//HCL_INFO4 (hcl, "FOUND ...[%.*js]................ ===> ctx_offset %d index %d\n", name->len, name->ptr, (int)(vi->ctx_offset), (int)vi->index_in_ctx);
+/*HCL_INFO4 (hcl, "FOUND ...[%.*js]................ ===> ctx_offset %d index %d\n", name->len, name->ptr, (int)(vi->ctx_offset), (int)vi->index_in_ctx);*/
 
 			if (vi->ctx_offset > 0)
 			{
@@ -395,7 +395,7 @@ HCL_INFO2 (hcl, "CLASS NAMED VAR [%.*js]\n", name->len, name->ptr);
 		}
 	}
 
-//HCL_INFO2 (hcl, "NOT FOUND => %.*js\n", name->len, name->ptr);
+/*HCL_INFO2 (hcl, "NOT FOUND => %.*js\n", name->len, name->ptr); */
 	return 0; /* not found */
 }
 
@@ -1507,7 +1507,7 @@ enum
 	COP_POST_TRY,
 	COP_POST_CATCH,
 
-	COP_POST_LAMBDA,
+	COP_POST_LAMBDA
 };
 
 /* ========================================================================= */
diff --git a/lib/err.c b/lib/err.c
index f177b07..92df38c 100644
--- a/lib/err.c
+++ b/lib/err.c
@@ -250,7 +250,7 @@ const hcl_uch_t* hcl_geterrumsg (hcl_t* hcl)
 	const hcl_ooch_t* msg;
 	hcl_oow_t wcslen, mbslen;
 
-	msg = (hcl->errmsg.len <= 0)? hcl_errnum_to_errstrerrstr(hcl->errnum): hcl->errmsg.buf;
+	msg = (hcl->errmsg.len <= 0)? hcl_errnum_to_errstr(hcl->errnum): hcl->errmsg.buf;
 
 	wcslen = HCL_COUNTOF(hcl->errmsg.xerrmsg);
 	hcl_conv_bcstr_to_ucstr_with_cmgr (msg, &mbslen, hcl->errmsg.xerrmsg, &wcslen, hcl_getcmgr(hcl), 1);
diff --git a/lib/exec.c b/lib/exec.c
index c205c6e..5584a6b 100644
--- a/lib/exec.c
+++ b/lib/exec.c
@@ -2412,7 +2412,7 @@ static int is_regular_executable_file_by_me(const char *path)
 {
 	struct stat st;
 	if (stat(path, &st) == -1) return 0;
-	return S_ISREG(st.st_mode) && access(path, X_OK) == 0; //? use eaccess instead??
+	return S_ISREG(st.st_mode) && access(path, X_OK) == 0; /* use eaccess instead?? */
 }
 
 static char* find_exec (hcl_t* hcl, const char *name)
@@ -3847,7 +3847,7 @@ if (do_throw(hcl, hcl->_nil, fetched_instruction_pointer) <= -1)
  				}
 				else sc = hcl->_nil;
 
-				t = hcl_makeclass(hcl, sc, b2, b3, ivars_str, cvars_str); // TOOD: pass variable information...
+				t = hcl_makeclass(hcl, sc, b2, b3, ivars_str, cvars_str); /* TOOD: pass variable information... */
 				if (HCL_UNLIKELY(!t)) goto oops_with_errmsg_supplement;
 
 				/* push the class created to the class stack. but don't push to the normal operation stack */
diff --git a/lib/hcl.h b/lib/hcl.h
index 805e05c..5677b8e 100644
--- a/lib/hcl.h
+++ b/lib/hcl.h
@@ -93,7 +93,7 @@ enum hcl_errnum_t
 	HCL_EEXCEPT,    /**< runtime error - exception not handled */
 	HCL_ESTKOVRFLW, /**< runtime error - stack overflow */
 	HCL_ESTKUNDFLW, /**< runtime error - stack overflow */
-	HCL_EUNDEFVAR,  /**< runtime error - undefined variable access */
+	HCL_EUNDEFVAR  /**< runtime error - undefined variable access */
 };
 typedef enum hcl_errnum_t hcl_errnum_t;