diff --git a/host.c b/host.c
index 8a3a7a7..a970cb6 100644
--- a/host.c
+++ b/host.c
@@ -496,7 +496,7 @@ static void try_reconnect(H3270 *session)
 
 LIB3270_EXPORT int lib3270_disconnect(H3270 *h)
 {
-	host_disconnect(h,0);
+	host_disconnect(h,0);
 	return 0;
 }
 
diff --git a/kybd.c b/kybd.c
index ac00510..f088af4 100644
--- a/kybd.c
+++ b/kybd.c
@@ -1007,8 +1007,8 @@ LIB3270_EXPORT int lib3270_input_string(H3270 *hSession, const unsigned char *st
 		str++;
 	}
 
-	screen_update(hSession,0,hSession->rows*hSession->cols);
-
+	screen_update(hSession,0,hSession->rows*hSession->cols);
+
 	return 0;
 }
 
diff --git a/macros.c b/macros.c
index 77b4122..ecf63ff 100644
--- a/macros.c
+++ b/macros.c
@@ -330,8 +330,8 @@
  	int f;
 
 	CHECK_SESSION_HANDLE(session);
-
-	trace("macro(%s)",argv[0]);
+
+	trace("macro(%s)",argv[0]);
 
 	// Get the number of arguments
 	for(argc = 0; argv[argc]; argc++);
diff --git a/screen.c b/screen.c
index fe0ec75..4f412b5 100644
--- a/screen.c
+++ b/screen.c
@@ -388,8 +388,8 @@ LIB3270_EXPORT int lib3270_get_cursor_address(H3270 *h)
 LIB3270_EXPORT int lib3270_set_cursor_address(H3270 *h, int baddr)
 {
     CHECK_SESSION_HANDLE(h);
-
-	trace("%s(%d)",__FUNCTION__,baddr);
+
+	trace("%s(%d)",__FUNCTION__,baddr);
 
 	if(h->selected && !lib3270_get_toggle(h,LIB3270_TOGGLE_KEEP_SELECTED))
 		lib3270_unselect(h);
diff --git a/selection.c b/selection.c
index d8b7405..2cdbcfb 100644
--- a/selection.c
+++ b/selection.c
@@ -488,9 +488,9 @@ LIB3270_EXPORT char * lib3270_get_text(H3270 *h, int offset, int len)
 	}
 
 	maxlen = (h->rows * (h->cols+1)) - offset;
-	if(maxlen <= 0 || offset < 0)
-	{
-		errno = EINVAL;
+	if(maxlen <= 0 || offset < 0)
+	{
+		errno = EINVAL;
 		return NULL;
 	}
 
diff --git a/toggles.c b/toggles.c
index 7e260f3..8e34990 100644
--- a/toggles.c
+++ b/toggles.c
@@ -105,9 +105,11 @@ static void toggle_notify(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGG
 		session->update_toggle(session,ix,t->value,TT_INTERACTIVE,toggle_names[ix]);
 
 }
-
LIB3270_EXPORT int lib3270_set_toggle(H3270 *session, LIB3270_TOGGLE ix, int value)
+
+LIB3270_EXPORT int lib3270_set_toggle(H3270 *session, LIB3270_TOGGLE ix, int value)
 {
-	char v = value ? True : False;
	struct lib3270_toggle * t;
+	char v = value ? True : False;
+	struct lib3270_toggle * t;
 
 	CHECK_SESSION_HANDLE(session);
 
@@ -118,9 +120,11 @@ static void toggle_notify(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGG
 
 	if(v == t->value)
 		return 0;
-
	t->value = v;
 
-	toggle_notify(session,t,ix);

	return 1;
+	t->value = v;
+
+	toggle_notify(session,t,ix);
+	return 1;
 }
 
 LIB3270_EXPORT int lib3270_toggle(H3270 *session, LIB3270_TOGGLE ix)
--
libgit2 0.21.2