diff --git a/src/wtp/wtp_dfa.c b/src/wtp/wtp_dfa.c
index 2aed037..f0df638 100644
--- a/src/wtp/wtp_dfa.c
+++ b/src/wtp/wtp_dfa.c
@@ -59,9 +59,8 @@ static void wtp_send_invalid_request(struct capwap_packet_rxmng* rxmngpacket, ui
 	/* Unknown response complete, get fragment packets */
 	responsefragmentpacket = capwap_list_create();
 	capwap_packet_txmng_get_fragment_packets(txmngpacket, responsefragmentpacket, g_wtp.fragmentid);
-	if (responsefragmentpacket->count > 1) {
+	if (responsefragmentpacket->count > 1)
 		g_wtp.fragmentid++;
-	}
 
 	/* Free packets manager */
 	capwap_packet_txmng_free(txmngpacket);
diff --git a/src/wtp/wtp_dfa_configure.c b/src/wtp/wtp_dfa_configure.c
index 9eb634c..dd02918 100644
--- a/src/wtp/wtp_dfa_configure.c
+++ b/src/wtp/wtp_dfa_configure.c
@@ -87,9 +87,8 @@ void wtp_send_configure(void) {
 	/* Configuration Status request complete, get fragment packets */
 	wtp_free_reference_last_request();
 	capwap_packet_txmng_get_fragment_packets(txmngpacket, g_wtp.requestfragmentpacket, g_wtp.fragmentid);
-	if (g_wtp.requestfragmentpacket->count > 1) {
+	if (g_wtp.requestfragmentpacket->count > 1)
 		g_wtp.fragmentid++;
-	}
 
 	/* Free packets manager */
 	capwap_packet_txmng_free(txmngpacket);
diff --git a/src/wtp/wtp_dfa_datacheck.c b/src/wtp/wtp_dfa_datacheck.c
index 6f60dd6..9b5bfa2 100644
--- a/src/wtp/wtp_dfa_datacheck.c
+++ b/src/wtp/wtp_dfa_datacheck.c
@@ -27,9 +27,8 @@ void wtp_send_datacheck(void)
 	/* Change State Event request complete, get fragment packets */
 	wtp_free_reference_last_request();
 	capwap_packet_txmng_get_fragment_packets(txmngpacket, g_wtp.requestfragmentpacket, g_wtp.fragmentid);
-	if (g_wtp.requestfragmentpacket->count > 1) {
+	if (g_wtp.requestfragmentpacket->count > 1)
 		g_wtp.fragmentid++;
-	}
 
 	/* Free packets manager */
 	capwap_packet_txmng_free(txmngpacket);
diff --git a/src/wtp/wtp_dfa_dtls.c b/src/wtp/wtp_dfa_dtls.c
index 51b4353..c83c547 100644
--- a/src/wtp/wtp_dfa_dtls.c
+++ b/src/wtp/wtp_dfa_dtls.c
@@ -62,9 +62,8 @@ static void wtp_dfa_state_dtlsteardown_timeout(struct capwap_timeout* timeout,
 					       unsigned long index, void* context, void* param)
 {
 	/* Free and reset resource */
-	if (g_wtp.dtls.enable) {
+	if (g_wtp.dtls.enable)
 		capwap_crypt_freesession(&g_wtp.dtls);
-	}
 
 	/* */
 	if (g_wtp.acname.name) {
@@ -103,9 +102,8 @@ void wtp_teardown_connection(void)
 	/* TODO: close SSID ? */
 
 	/* DTSL Control */
-	if (g_wtp.dtls.enable) {
+	if (g_wtp.dtls.enable)
 		capwap_crypt_close(&g_wtp.dtls);
-	}
 
 	/* Close data channel session */
 	wtp_kmod_resetsession();
diff --git a/src/wtp/wtp_dfa_join.c b/src/wtp/wtp_dfa_join.c
index 848c225..4a8b6c2 100644
--- a/src/wtp/wtp_dfa_join.c
+++ b/src/wtp/wtp_dfa_join.c
@@ -45,9 +45,8 @@ void wtp_send_join(void)
 	capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_WTPFRAMETUNNELMODE, &g_wtp.mactunnel);
 	capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_WTPMACTYPE, &g_wtp.mactype);
 
-	if (g_wtp.binding == CAPWAP_WIRELESS_BINDING_IEEE80211) {
+	if (g_wtp.binding == CAPWAP_WIRELESS_BINDING_IEEE80211)
 		wtp_create_80211_wtpradioinformation_element(txmngpacket);
-	}
 
 	capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_ECNSUPPORT, &g_wtp.ecn);
 
@@ -71,9 +70,8 @@ void wtp_send_join(void)
 	/* Join request complete, get fragment packets */
 	wtp_free_reference_last_request();
 	capwap_packet_txmng_get_fragment_packets(txmngpacket, g_wtp.requestfragmentpacket, g_wtp.fragmentid);
-	if (g_wtp.requestfragmentpacket->count > 1) {
+	if (g_wtp.requestfragmentpacket->count > 1)
 		g_wtp.fragmentid++;
-	}
 
 	/* Free packets manager */
 	capwap_packet_txmng_free(txmngpacket);
diff --git a/src/wtp/wtp_dfa_run.c b/src/wtp/wtp_dfa_run.c
index d3995b9..53254bf 100644
--- a/src/wtp/wtp_dfa_run.c
+++ b/src/wtp/wtp_dfa_run.c
@@ -23,9 +23,8 @@ static int send_echo_request(void)
 	/* Echo request complete, get fragment packets */
 	wtp_free_reference_last_request();
 	capwap_packet_txmng_get_fragment_packets(txmngpacket, g_wtp.requestfragmentpacket, g_wtp.fragmentid);
-	if (g_wtp.requestfragmentpacket->count > 1) {
+	if (g_wtp.requestfragmentpacket->count > 1)
 		g_wtp.fragmentid++;
-	}
 
 	/* Free packets manager */
 	capwap_packet_txmng_free(txmngpacket);