diff --git a/lib/radio_esp8266.c b/lib/radio_esp8266.c
index 175e510..ff281f4 100644
--- a/lib/radio_esp8266.c
+++ b/lib/radio_esp8266.c
@@ -51,8 +51,8 @@ static void radio_esp8266_transmit(uint8_t* data, uint8_t length) {
 	}
 	usart_disable_tx_interrupt(USART(RADIO_ESP8266_USART)); // ensure transmit interrupt is disable to prevent index corruption (the ISR should already have done it)
 	radio_esp8266_activity = false; // reset status because of new activity
-	for (tx_used=0; tx_used<length && tx_used<LENGTH(tx_buffer); tx_used++) { // copy data
-		tx_buffer[tx_used] = data[length-1-tx_used]; // put character in buffer (in reverse order)
+	for (tx_used = 0; tx_used < length && tx_used < LENGTH(tx_buffer); tx_used++) { // copy data
+		tx_buffer[tx_used] = data[length - 1 - tx_used]; // put character in buffer (in reverse order)
 	}
 	if (tx_used) {
 		usart_enable_tx_interrupt(USART(RADIO_ESP8266_USART)); // enable interrupt to send bytes
@@ -90,18 +90,18 @@ void radio_esp8266_setup(void)
 	radio_esp8266_activity = false;
 	radio_esp8266_success = false;
 
-	radio_esp8266_transmit((uint8_t*)"AT\r\n",4); // verify if module is present
+	radio_esp8266_transmit((uint8_t*)"AT\r\n", 4); // verify if module is present
 	while (!radio_esp8266_activity || !radio_esp8266_success) { // wait for response
 		__WFI(); // sleep until something happened
 	}
-	radio_esp8266_transmit((uint8_t*)"AT+RST\r\n",8); // reset module
+	radio_esp8266_transmit((uint8_t*)"AT+RST\r\n", 8); // reset module
 	while (!radio_esp8266_activity || !radio_esp8266_success) { // wait for response
 		__WFI(); // sleep until something happened
 	}
-	while(rx_used<13 || memcmp((char*)&rx_buffer[rx_used-13], "WIFI GOT IP\r\n", 13)!=0) { // wait to have IP
+	while(rx_used < 13 || memcmp((char*)&rx_buffer[rx_used - 13], "WIFI GOT IP\r\n", 13) != 0) { // wait to have IP
 		 __WFI(); // sleep until something happened
 	}
-	radio_esp8266_transmit((uint8_t*)"ATE0\r\n",6); // disable echoing
+	radio_esp8266_transmit((uint8_t*)"ATE0\r\n", 6); // disable echoing
 	while (!radio_esp8266_activity || !radio_esp8266_success) { // wait for response
 		__WFI(); // sleep until something happened
 	}
@@ -111,16 +111,16 @@ void radio_esp8266_tcp_open(char* host, uint16_t port)
 {
 	char command[256] = {0}; // string to create command
 	int length = snprintf(command, LENGTH(command), "AT+CIPSTART=\"TCP\",\"%s\",%u\r\n", host, port); // create AT command to establish a TCP connection
-	if (length>0) {
+	if (length > 0) {
 		radio_esp8266_transmit((uint8_t*)command, length);
 	}
 }
 
 void radio_esp8266_send(uint8_t* data, uint8_t length)
 {
-	char command[16+1] = {0}; // string to create command
+	char command[16 + 1] = {0}; // string to create command
 	int command_length = snprintf(command, LENGTH(command), "AT+CIPSEND=%u\r\n", length); // create AT command to send data
-	if (command_length>0) {
+	if (command_length > 0) {
 		radio_esp8266_transmit((uint8_t*)command, command_length); // transmit AT command
 		while (!radio_esp8266_activity || !radio_esp8266_success) { // wait for response
 			__WFI(); // sleep until something happened
@@ -140,26 +140,26 @@ void radio_esp8266_close(void)
 /** USART interrupt service routine called when data has been transmitted or received */
 void USART_ISR(RADIO_ESP8266_USART)(void)
 {
-	if (usart_get_interrupt_source(USART(RADIO_ESP8266_USART), USART_SR_TXE)) { // data has been transmitted
+	if (usart_get_flag(USART(RADIO_ESP8266_USART), USART_SR_TXE)) { // data has been transmitted
 		if (tx_used) { // there is still data in the buffer to transmit
-			usart_send(USART(RADIO_ESP8266_USART),tx_buffer[tx_used-1]); // put data in transmit register
+			usart_send(USART(RADIO_ESP8266_USART), tx_buffer[tx_used - 1]); // put data in transmit register
 			tx_used--; // update used size
 		} else { // no data in the buffer to transmit
 			usart_disable_tx_interrupt(USART(RADIO_ESP8266_USART)); // disable transmit interrupt
 		}
 	}
-	if (usart_get_interrupt_source(USART(RADIO_ESP8266_USART), USART_SR_RXNE)) { // data has been received
-		while (rx_used>=LENGTH(rx_buffer)) { // if buffer is full
-			memmove(rx_buffer,&rx_buffer[1],LENGTH(rx_buffer)-1); // drop old data to make space (ring buffer are more efficient but harder to handle)
+	if (usart_get_flag(USART(RADIO_ESP8266_USART), USART_SR_RXNE)) { // data has been received
+		while (rx_used >= LENGTH(rx_buffer)) { // if buffer is full
+			memmove(rx_buffer, &rx_buffer[1], LENGTH(rx_buffer) - 1); // drop old data to make space (ring buffer are more efficient but harder to handle)
 			rx_used--; // update used buffer information
 		}
 		rx_buffer[rx_used++] = usart_recv(USART(RADIO_ESP8266_USART)); // put character in buffer
 		// if the used send a packet with these strings during the commands detection the AT command response will break (AT commands are hard to handle perfectly)
-		if (rx_used>=4 && memcmp((char*)&rx_buffer[rx_used-4], "OK\r\n", 4)==0) { // OK received
+		if (rx_used >= 4 && memcmp((char*)&rx_buffer[rx_used - 4], "OK\r\n", 4) == 0) { // OK received
 			radio_esp8266_activity = true; // response received
 			radio_esp8266_success = true; // command succeeded
 			rx_used = 0; // reset buffer
-		} else if (rx_used>=7 && memcmp((char*)&rx_buffer[rx_used-7], "ERROR\r\n", 7)==0) { // ERROR received
+		} else if (rx_used >= 7 && memcmp((char*)&rx_buffer[rx_used - 7], "ERROR\r\n", 7) == 0) { // ERROR received
 			radio_esp8266_activity = true; // response received
 			radio_esp8266_success = false; // command failed
 			rx_used = 0; // reset buffer