diff --git a/src/airbase-ng.c b/src/airbase-ng.c
index 7d9ae16b07..77c2a25798 100644
--- a/src/airbase-ng.c
+++ b/src/airbase-ng.c
@@ -174,7 +174,7 @@ char usage[]
 	  "      -q               : quiet (do not print statistics)\n"
 	  "      -v               : verbose (print more messages)\n"
 	  //"      -M               : M-I-T-M between [specified] clients and
-	  //bssids\n"
+	  // bssids\n"
 	  "      -A               : Ad-Hoc Mode (allows other clients to peer)\n"
 	  "      -Y in|out|both   : external packet processing\n"
 	  "      -c channel       : sets the channel the AP is running on\n"
diff --git a/src/aircrack-ng.c b/src/aircrack-ng.c
index b49d8b29cd..705d0bd03b 100644
--- a/src/aircrack-ng.c
+++ b/src/aircrack-ng.c
@@ -537,7 +537,8 @@ static int parse_ivs2(struct AP_info * ap_cur,
 			memcpy(ap_cur->ivbuf + n, buffer, 5);
 			uniqueiv_mark(ap_cur->uiv_root, buffer);
 			ap_cur->nb_ivs++;
-			// 					all_ivs[256*256*buffer[0] + 256*buffer[1] + buffer[2]].used
+			// 					all_ivs[256*256*buffer[0] + 256*buffer[1] +
+			// buffer[2]].used
 			// |= GOT_IV;
 		}
 	}
@@ -558,7 +559,8 @@ static int parse_ivs2(struct AP_info * ap_cur,
 			memcpy(weight,
 				   buffer + clearsize - 15 * sizeof(int),
 				   16 * sizeof(int));
-			// 					printf("weight 1: %d, weight 2: %d\n", weight[0],
+			// 					printf("weight 1: %d, weight 2: %d\n",
+			// weight[0],
 			// weight[1]);
 
 			if (PTW_addsession(
@@ -2312,10 +2314,12 @@ static int crack_wep_thread(void * arg)
 
 			for (i = j = 0; i < q; i++)
 			{
-				//				i can never be 3+opt.keylen or exceed it, as i runs
-				//from 0 to q and q is defined as 3+B (with B the keybyte to
-				//attack)
-				// 				jj[i] = j = ( j + S[i] + K[i % (3 + opt.keylen)] ) &
+				//				i can never be 3+opt.keylen or exceed it, as i
+				//runs
+				// from 0 to q and q is defined as 3+B (with B the keybyte to
+				// attack)
+				// 				jj[i] = j = ( j + S[i] + K[i % (3 + opt.keylen)] )
+				// &
 				// 0xFF;
 				jj[i] = j = (j + S[i] + K[i]) & 0xFF;
 				SWAP(S[i], S[j]);
@@ -2356,19 +2360,23 @@ static int crack_wep_thread(void * arg)
 					Kq = 2 - dq;
 					votes[A_neg][Kq]++;
 					// to signal general usage
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
 					// to know which attack used this iv
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_neg);
 				}
 				else if (o2 == 0)
 				{
 					Kq = 2 - dq;
 					votes[A_neg][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_neg);
 				}
 			}
@@ -2378,9 +2386,11 @@ static int crack_wep_thread(void * arg)
 				{
 					Kq = 2 - dq;
 					votes[A_u15][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u15);
 				}
 			}
@@ -2393,7 +2403,8 @@ static int crack_wep_thread(void * arg)
 				votes[A_neg][Kq]++;
 				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
 				// USE_IV;
-				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
 				// (4+A_neg);
 			}
 
@@ -2405,7 +2416,8 @@ static int crack_wep_thread(void * arg)
 				votes[A_neg][Kq]++;
 				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
 				// USE_IV;
-				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
 				// (4+A_neg);
 			}
 
@@ -2415,18 +2427,22 @@ static int crack_wep_thread(void * arg)
 				{
 					Kq = Si[0] - dq;
 					votes[A_s13][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_s13);
 				}
 				else if (((1 - q - o1) & 0xFF) == 0)
 				{
 					Kq = io1 - dq;
 					votes[A_u13_1][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u13_1);
 				}
 				else if (io1 < q)
@@ -2437,9 +2453,11 @@ static int crack_wep_thread(void * arg)
 					{
 						Kq = jq - dq;
 						votes[A_u5_1][Kq]++;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// USE_IV;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// 1 << (4+A_u5_1);
 					}
 				}
@@ -2451,7 +2469,8 @@ static int crack_wep_thread(void * arg)
 				votes[A_u5_2][Kq]++;
 				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
 				// USE_IV;
-				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
 				// (4+A_u5_2);
 			}
 
@@ -2461,18 +2480,22 @@ static int crack_wep_thread(void * arg)
 				{
 					Kq = 1 - dq;
 					votes[A_u13_2][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u13_2);
 				}
 				else if ((((1 - q - S1) & 0xFF) == 0) && (o1 == S1))
 				{
 					Kq = 1 - dq;
 					votes[A_u13_3][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u13_3);
 				}
 				else if ((S1 >= ((-q) & 0xFF))
@@ -2480,9 +2503,11 @@ static int crack_wep_thread(void * arg)
 				{
 					Kq = 1 - dq;
 					votes[A_u5_3][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u5_3);
 				}
 			}
@@ -2494,7 +2519,8 @@ static int crack_wep_thread(void * arg)
 				votes[A_s5_1][Kq]++;
 				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
 				// USE_IV;
-				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
 				// (4+A_s5_1);
 			}
 
@@ -2508,9 +2534,11 @@ static int crack_wep_thread(void * arg)
 					{
 						Kq = jq - dq;
 						votes[A_s5_2][Kq]++;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// USE_IV;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// 1 << (4+A_s5_2);
 					}
 				}
@@ -2522,9 +2550,11 @@ static int crack_wep_thread(void * arg)
 					{
 						Kq = jq - dq;
 						votes[A_s5_3][Kq]++;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// USE_IV;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// 1 << (4+A_s5_3);
 					}
 				}
@@ -2542,9 +2572,11 @@ static int crack_wep_thread(void * arg)
 					{
 						Kq = io2 - dq;
 						votes[A_s3][Kq]++;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// USE_IV;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// 1 << (4+A_s3);
 					}
 				}
@@ -2558,9 +2590,11 @@ static int crack_wep_thread(void * arg)
 					{
 						Kq = Si[0] - dq;
 						votes[A_4_s13][Kq]++;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// USE_IV;
-						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
 						// 1 << (4+A_4_s13);
 					}
 					else
@@ -2569,18 +2603,22 @@ static int crack_wep_thread(void * arg)
 						{
 							Kq = Si[254] - dq;
 							votes[A_4_u5_1][Kq]++;
-							// 							all_ivs[256*256*K[0] + 256*K[1] +
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
 							// K[2]].used |= USE_IV;
-							// 							all_ivs[256*256*K[0] + 256*K[1] +
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
 							// K[2]].used |= 1 << (4+A_4_u5_1);
 						}
 						if ((jj[1] == 2) && (io2 == 2))
 						{
 							Kq = Si[255] - dq;
 							votes[A_4_u5_2][Kq]++;
-							// 							all_ivs[256*256*K[0] + 256*K[1] +
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
 							// K[2]].used |= USE_IV;
-							// 							all_ivs[256*256*K[0] + 256*K[1] +
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
 							// K[2]].used |= 1 << (4+A_4_u5_2);
 						}
 					}
@@ -2590,9 +2628,11 @@ static int crack_wep_thread(void * arg)
 				{
 					Kq = io2 - dq;
 					votes[A_u5_4][Kq]++;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
 					// USE_IV;
-					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 <<
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
 					// (4+A_u5_4);
 				}
 			}
@@ -4887,8 +4927,9 @@ static int next_key(char ** key, int keysize)
 					textcolor_fg(TEXT_GREEN);
 				}
 
-				//				printf( "\nPassphrase not in dictionary \"%s\" \n",
-				//opt.dicts[opt.nbdict] );
+				//				printf( "\nPassphrase not in dictionary \"%s\"
+				//\n",
+				// opt.dicts[opt.nbdict] );
 				if (next_dict(opt.nbdict + 1) != 0)
 				{
 					free(tmpref);
@@ -4947,8 +4988,9 @@ static int next_key(char ** key, int keysize)
 					textcolor_fg(TEXT_GREEN);
 				}
 
-				//				printf( "\nPassphrase not in dictionary \"%s\" \n",
-				//opt.dicts[opt.nbdict] );
+				//				printf( "\nPassphrase not in dictionary \"%s\"
+				//\n",
+				// opt.dicts[opt.nbdict] );
 				if (next_dict(opt.nbdict + 1) != 0)
 				{
 					free(tmpref);
@@ -6104,7 +6146,8 @@ int main(int argc, char * argv[])
 		/* wait until each thread reaches EOF */
 
 		// 		#ifndef DO_PGO_DUMP
-		// 		signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump pgo
+		// 		signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump
+		// pgo
 		// data */
 		// 		#endif
 
diff --git a/src/aircrack-osdep/linux.c b/src/aircrack-osdep/linux.c
index 1d65f9094b..a9101dc996 100644
--- a/src/aircrack-osdep/linux.c
+++ b/src/aircrack-osdep/linux.c
@@ -1843,8 +1843,9 @@ static int do_linux_open(struct wif * wi, char * iface)
 
 	if (!iwpriv)
 	{
-		fprintf(stderr, "Required wireless tools when compiled without libnl "
-						"could not be found, exiting.\n");
+		fprintf(stderr,
+				"Required wireless tools when compiled without libnl "
+				"could not be found, exiting.\n");
 		goto close_in;
 	}
 #endif
diff --git a/src/aircrack-ptw-lib.c b/src/aircrack-ptw-lib.c
index 1c7d41c3eb..74c7263894 100644
--- a/src/aircrack-ptw-lib.c
+++ b/src/aircrack-ptw-lib.c
@@ -236,11 +236,11 @@ rc4test_amd64_sse2(uint8_t * key, int keylen, uint8_t * iv, uint8_t * keystream)
 		"movzbl  %b2, %k8             \n\t" /* scratch2        = j */
 		"movl (" state
 		",%q8,4), %k7    \n\t" /* s2              = state[scratch2] */
-		"movl    %k7, (%q1)           \n\t" /* state[i]        = s2 */
-		"addq     $4, %q1             \n\t" /* i++ */
+		"movl    %k7, (%q1)           \n\t"   /* state[i]        = s2 */
+		"addq     $4, %q1             \n\t"   /* i++ */
 		"movl    %k5, (" state ",%q8,4) \n\t" /* state[scratch2] = s1 */
-		"cmpq    %q1, %q3             \n\t" /* state          == &state[0x100]
-											   */
+		"cmpq    %q1, %q3             \n\t"   /* state          == &state[0x100]
+												 */
 		"jne .init_loop               \n\t"
 
 		// restore keystream variable
diff --git a/src/airdecloak-ng.c b/src/airdecloak-ng.c
index ed176b5ce6..da5531ebd5 100644
--- a/src/airdecloak-ng.c
+++ b/src/airdecloak-ng.c
@@ -1521,7 +1521,7 @@ static void usage(void)
 		"cloaked.\n"
 		"     --disable-base_filter : Do not apply base filter.\n"
 		//"     --disable-retry       : Disable retry check, don't care about
-		//retry bit.\n"
+		// retry bit.\n"
 		"     --drop-frag           : Drop fragmented packets\n"
 		"\n"
 		"     --help                : Displays this usage screen\n"
diff --git a/src/airodump-ng.c b/src/airodump-ng.c
index b251e59ebc..c44582dc45 100644
--- a/src/airodump-ng.c
+++ b/src/airodump-ng.c
@@ -1799,7 +1799,8 @@ static int dump_add_packet(unsigned char * h80211,
 
 				st_cur->probe_index = (st_cur->probe_index + 1) % NB_PRB;
 				memset(st_cur->probes[st_cur->probe_index], 0, 256);
-				memcpy(st_cur->probes[st_cur->probe_index], p + 2, n); // twice?!
+				memcpy(
+					st_cur->probes[st_cur->probe_index], p + 2, n); // twice?!
 				st_cur->ssid_length[st_cur->probe_index] = n;
 
 				if (verifyssid((const unsigned char *)
@@ -2919,7 +2920,7 @@ static int dump_add_packet(unsigned char * h80211,
 	{
 		/* RTS || CTS || ACK || CF-END || CF-END&CF-ACK*/
 		//(h80211[0] == 0xB4 || h80211[0] == 0xC4 || h80211[0] == 0xD4 ||
-		//h80211[0] == 0xE4 || h80211[0] == 0xF4)
+		// h80211[0] == 0xE4 || h80211[0] == 0xF4)
 
 		/* use general control frame detection, as the structure is always the
 		 * same: mac(s) starting at [4] */
diff --git a/src/airodump-ng.h b/src/airodump-ng.h
index f7a06197a0..28be360047 100644
--- a/src/airodump-ng.h
+++ b/src/airodump-ng.h
@@ -166,10 +166,9 @@ struct pkt_buf
 /* oui struct for list management */
 struct oui
 {
-	char
-		id[9]; /* TODO: Don't use ASCII chars to compare, use unsigned char[3]
-				  (later) with the value (hex ascii will have to be converted)
-				  */
+	char id[9]; /* TODO: Don't use ASCII chars to compare, use unsigned char[3]
+				   (later) with the value (hex ascii will have to be converted)
+				   */
 	char
 		manuf[128]; /* TODO: Switch to a char * later to improve memory usage */
 	struct oui * next;
diff --git a/src/besside-ng-crawler.c b/src/besside-ng-crawler.c
index 500851f137..bd1cb7d798 100644
--- a/src/besside-ng-crawler.c
+++ b/src/besside-ng-crawler.c
@@ -159,7 +159,7 @@ static struct bsslist * get_eapol_bssids(pcap_t * handle)
 			}
 			else
 			{ // fromDS - I skip adhoc and wds since its unlikely to have eapol
-			  // in there (?)
+				// in there (?)
 				bssid = pkt + 10 + o;
 			}
 
diff --git a/src/session.c b/src/session.c
index 52c476db5e..4ce29b821f 100644
--- a/src/session.c
+++ b/src/session.c
@@ -323,10 +323,10 @@ struct session * ac_session_load(const char * filename)
 			case AC_SESSION_WL_SETTINGS_LINE: // Wordlist ID, position in
 											  // wordlist and amount of keys
 											  // tried
-			{
-				temp = ac_session_set_wordlist_settings(ret, line);
-				break;
-			}
+				{
+					temp = ac_session_set_wordlist_settings(ret, line);
+					break;
+				}
 			case AC_SESSION_ARGC_LINE: // Number of arguments
 			{
 				temp = ac_session_set_amount_arguments(ret, line);
diff --git a/src/tkiptun-ng.c b/src/tkiptun-ng.c
index 6183f4f85e..4782caa135 100644
--- a/src/tkiptun-ng.c
+++ b/src/tkiptun-ng.c
@@ -2836,7 +2836,7 @@ static int do_attack_tkipchop(unsigned char * src_packet, int src_packet_len)
 			/* check length (153)!? */
 			if (z + 127 != n)
 				continue; //(153[26+127] bytes for eapol mic failure in tkip qos
-						  //frames from client to AP)
+						  // frames from client to AP)
 
 			//             printf("yeah!\n");