diff --git a/src/platforms/hosted/platform.c b/src/platforms/hosted/platform.c
index 9fec305..86f521e 100644
--- a/src/platforms/hosted/platform.c
+++ b/src/platforms/hosted/platform.c
@@ -45,25 +45,29 @@ bmp_info_t info;
 
 jtag_proc_t jtag_proc;
 
+static BMP_CL_OPTIONS_t cl_opts;
+
 void gdb_ident(char *p, int count)
 {
-	snprintf(p, count, "%s (%s), %s", info.manufacturer, info.product,
-			 info.version);
+	snprintf(p, count, "%s (%s), %s", info.manufacturer, info.product, info.version);
 }
 
 static void exit_function(void)
 {
 	libusb_exit_function(&info);
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_CMSIS_DAP:
 		dap_exit_function();
 		break;
+
 	default:
 		break;
 	}
-	#ifdef ENABLE_RTT
+
+#ifdef ENABLE_RTT
 	rtt_if_exit();
-	#endif
+#endif
 	fflush(stdout);
 }
 
@@ -74,51 +78,59 @@ static void sigterm_handler(int sig)
 	exit(0);
 }
 
-static	BMP_CL_OPTIONS_t cl_opts;
-
 void platform_init(int argc, char **argv)
 {
 	cl_init(&cl_opts, argc, argv);
 	atexit(exit_function);
 	signal(SIGTERM, sigterm_handler);
 	signal(SIGINT, sigterm_handler);
+
 	if (cl_opts.opt_device)
 		info.bmp_type = BMP_TYPE_BMP;
 	else if (find_debuggers(&cl_opts, &info))
 		exit(-1);
+
 	bmp_ident(&info);
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		if (serial_open(&cl_opts, info.serial))
 			exit(-1);
 		remote_init();
 		break;
+
 	case BMP_TYPE_STLINKV2:
 		if (stlink_init(&info))
 			exit(-1);
 		break;
+
 	case BMP_TYPE_CMSIS_DAP:
 		if (dap_init(&info))
 			exit(-1);
 		break;
+
 	case BMP_TYPE_LIBFTDI:
 		if (ftdi_bmp_init(&cl_opts, &info))
 			exit(-1);
 		break;
+
 	case BMP_TYPE_JLINK:
 		if (jlink_init(&info))
 			exit(-1);
 		break;
+
 	default:
 		exit(-1);
 	}
+
 	if (cl_opts.opt_mode != BMP_MODE_DEBUG)
 		exit(cl_execute(&cl_opts));
 	else {
 		gdb_if_init();
-		#ifdef ENABLE_RTT
+
+#ifdef ENABLE_RTT
 		rtt_if_init();
-		#endif
+#endif
 		return;
 	}
 }
@@ -127,14 +139,15 @@ int platform_adiv5_swdp_scan(uint32_t targetid)
 {
 	info.is_jtag = false;
 	platform_max_frequency_set(cl_opts.opt_max_swj_frequency);
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 	case BMP_TYPE_LIBFTDI:
 	case BMP_TYPE_CMSIS_DAP:
 		return adiv5_swdp_scan(targetid);
 		break;
-	case BMP_TYPE_STLINKV2:
-	{
+
+	case BMP_TYPE_STLINKV2: {
 		target_list_free();
 
 		ADIv5_DP_t *dp = calloc(1, sizeof(*dp));
@@ -152,8 +165,10 @@ int platform_adiv5_swdp_scan(uint32_t targetid)
 		}
 		break;
 	}
+
 	case BMP_TYPE_JLINK:
 		return jlink_swdp_scan(&info);
+
 	default:
 		return 0;
 	}
@@ -165,17 +180,20 @@ int swdptap_init(ADIv5_DP_t *dp)
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		return remote_swdptap_init(dp);
+
 	case BMP_TYPE_CMSIS_DAP:
 		return dap_swdptap_init(dp);
+
 	case BMP_TYPE_STLINKV2:
 	case BMP_TYPE_JLINK:
 		return 0;
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_swdptap_init(dp);
+
 	default:
 		return -1;
 	}
-	return -1;
 }
 
 void platform_add_jtag_dev(uint32_t i, const jtag_dev_t *jtag_dev)
@@ -187,19 +205,22 @@ void platform_add_jtag_dev(uint32_t i, const jtag_dev_t *jtag_dev)
 int platform_jtag_scan(const uint8_t *lrlens)
 {
 	info.is_jtag = true;
+
 	platform_max_frequency_set(cl_opts.opt_max_swj_frequency);
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 	case BMP_TYPE_LIBFTDI:
 	case BMP_TYPE_JLINK:
 	case BMP_TYPE_CMSIS_DAP:
 		return jtag_scan(lrlens);
+
 	case BMP_TYPE_STLINKV2:
 		return jtag_scan_stlinkv2(&info, lrlens);
+
 	default:
 		return -1;
 	}
-	return -1;
 }
 
 int platform_jtagtap_init(void)
@@ -207,23 +228,28 @@ int platform_jtagtap_init(void)
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		return remote_jtagtap_init(&jtag_proc);
+
 	case BMP_TYPE_STLINKV2:
 		return 0;
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_jtagtap_init(&jtag_proc);
+
 	case BMP_TYPE_JLINK:
 		return jlink_jtagtap_init(&info, &jtag_proc);
+
 	case BMP_TYPE_CMSIS_DAP:
 		return cmsis_dap_jtagtap_init(&jtag_proc);
+
 	default:
 		return -1;
 	}
-	return -1;
 }
 
 void platform_adiv5_dp_defaults(ADIv5_DP_t *dp)
 {
 	dp->dp_bmp_type = info.bmp_type;
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		if (cl_opts.opt_no_hl) {
@@ -231,10 +257,13 @@ void platform_adiv5_dp_defaults(ADIv5_DP_t *dp)
 			return;
 		}
 		return remote_adiv5_dp_defaults(dp);
+
 	case BMP_TYPE_STLINKV2:
 		return stlink_adiv5_dp_defaults(dp);
+
 	case BMP_TYPE_CMSIS_DAP:
 		return dap_adiv5_dp_defaults(dp);
+
 	default:
 		break;
 	}
@@ -247,33 +276,42 @@ int platform_jtag_dp_init(ADIv5_DP_t *dp)
 	case BMP_TYPE_LIBFTDI:
 	case BMP_TYPE_JLINK:
 		return 0;
+
 	case BMP_TYPE_STLINKV2:
 		return stlink_jtag_dp_init(dp);
+
 	case BMP_TYPE_CMSIS_DAP:
 		return dap_jtag_dp_init(dp);
+
 	default:
 		return 0;
 	}
-	return 0;
 }
 
 char *platform_ident(void)
 {
 	switch (info.bmp_type) {
-	  case BMP_TYPE_NONE:
+	case BMP_TYPE_NONE:
 		return "NONE";
-	  case BMP_TYPE_BMP:
+
+	case BMP_TYPE_BMP:
 		return "BMP";
-	  case BMP_TYPE_STLINKV2:
+
+	case BMP_TYPE_STLINKV2:
 		return "STLINKV2";
-	  case BMP_TYPE_LIBFTDI:
+
+	case BMP_TYPE_LIBFTDI:
 		return "LIBFTDI";
-	  case BMP_TYPE_CMSIS_DAP:
+
+	case BMP_TYPE_CMSIS_DAP:
 		return "CMSIS_DAP";
-	  case BMP_TYPE_JLINK:
+
+	case BMP_TYPE_JLINK:
 		return "JLINK";
+
+	default:
+		return NULL;
 	}
-	return NULL;
 }
 
 const char *platform_target_voltage(void)
@@ -281,16 +319,19 @@ const char *platform_target_voltage(void)
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		return remote_target_voltage();
+
 	case BMP_TYPE_STLINKV2:
 		return stlink_target_voltage(&info);
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_target_voltage();
+
 	case BMP_TYPE_JLINK:
 		return jlink_target_voltage(&info);
+
 	default:
-		break;
+		return NULL;
 	}
-	return NULL;
 }
 
 void platform_nrst_set_val(bool assert)
@@ -298,14 +339,19 @@ void platform_nrst_set_val(bool assert)
 	switch (info.bmp_type) {
 	case BMP_TYPE_STLINKV2:
 		return stlink_nrst_set_val(&info, assert);
+
 	case BMP_TYPE_BMP:
 		return remote_nrst_set_val(assert);
+
 	case BMP_TYPE_JLINK:
 		return jlink_nrst_set_val(&info, assert);
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_nrst_set_val(assert);
+
 	case BMP_TYPE_CMSIS_DAP:
 		return dap_nrst_set_val(assert);
+
 	default:
 		break;
 	}
@@ -316,50 +362,58 @@ bool platform_nrst_get_val(void)
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		return remote_nrst_get_val();
+
 	case BMP_TYPE_STLINKV2:
 		return stlink_nrst_get_val();
+
 	case BMP_TYPE_JLINK:
 		return jlink_nrst_get_val(&info);
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_nrst_get_val();
+
 	default:
-		break;
+		return false;
 	}
-	return false;
 }
 
 void platform_max_frequency_set(uint32_t freq)
 {
 	if (!freq)
 		return;
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		remote_max_frequency_set(freq);
 		break;
+
 	case BMP_TYPE_CMSIS_DAP:
 		dap_swj_clock(freq);
 		break;
+
 	case BMP_TYPE_LIBFTDI:
 		libftdi_max_frequency_set(freq);
 		break;
+
 	case BMP_TYPE_STLINKV2:
 		stlink_max_frequency_set(&info, freq);
 		break;
+
 	case BMP_TYPE_JLINK:
 		jlink_max_frequency_set(&info, freq);
 		break;
+
 	default:
 		DEBUG_WARN("Setting max SWJ frequency not yet implemented\n");
 		break;
 	}
+
 	uint32_t max_freq = platform_max_frequency_get();
 	if (max_freq == FREQ_FIXED)
-		DEBUG_INFO("Device has fixed frequency for %s\n",
-				   (info.is_jtag) ? "JTAG" : "SWD" );
+		DEBUG_INFO("Device has fixed frequency for %s\n", (info.is_jtag) ? "JTAG" : "SWD");
 	else
-		DEBUG_INFO("Speed set to %7.4f MHz for %s\n",
-				   platform_max_frequency_get() / 1000000.0,
-				   (info.is_jtag) ? "JTAG" : "SWD" );
+		DEBUG_INFO("Speed set to %7.4f MHz for %s\n", platform_max_frequency_get() / 1000000.0,
+			(info.is_jtag) ? "JTAG" : "SWD");
 }
 
 uint32_t platform_max_frequency_get(void)
@@ -367,20 +421,23 @@ uint32_t platform_max_frequency_get(void)
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
 		return remote_max_frequency_get();
+
 	case BMP_TYPE_CMSIS_DAP:
 		return dap_swj_clock(0);
-		break;
+
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_max_frequency_get();
+
 	case BMP_TYPE_STLINKV2:
 		return stlink_max_frequency_get(&info);
+
 	case BMP_TYPE_JLINK:
 		return jlink_max_frequency_get(&info);
+
 	default:
 		DEBUG_WARN("Reading max SWJ frequency not yet implemented\n");
-		break;
+		return 0;
 	}
-	return false;
 }
 
 void platform_target_set_power(bool power)
@@ -391,7 +448,8 @@ void platform_target_set_power(bool power)
 			DEBUG_INFO("Powering up device!\n");
 		else
 			DEBUG_WARN("Powering up device unimplemented or failed\n");
-	   break;
+		break;
+
 	default:
 		break;
 	}
@@ -401,32 +459,34 @@ bool platform_target_get_power(void)
 {
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP:
-	return remote_target_get_power() ;
+		return remote_target_get_power();
 
 	default:
-		return false ;
+		return false;
 	}
 }
 
 uint32_t platform_target_voltage_sense(void)
 {
-	uint32_t	targetVoltage = 0 ;
+	uint32_t targetVoltage = 0;
+
 	switch (info.bmp_type) {
 	case BMP_TYPE_BMP: {
-		const char * result ;
-		uint32_t units = 0, tenths = 0 ;
-		result = remote_target_voltage() ;
+		const char *const result = remote_target_voltage();
 		if (result != NULL) {
-			sscanf(result,"%"PRIu32".%"PRIu32, &units, &tenths) ;
-			targetVoltage = (units * 10) + tenths ;
+			uint32_t units = 0;
+			uint32_t tenths = 0;
+			sscanf(result, "%" PRIu32 ".%" PRIu32, &units, &tenths);
+			targetVoltage = (units * 10U) + tenths;
 		}
-		break ;
+		break;
 	}
 
 	default:
-		break ;
+		break;
 	}
-	return targetVoltage ;
+
+	return targetVoltage;
 }
 
 void platform_buffer_flush(void)
@@ -434,6 +494,7 @@ void platform_buffer_flush(void)
 	switch (info.bmp_type) {
 	case BMP_TYPE_LIBFTDI:
 		return libftdi_buffer_flush();
+
 	default:
 		break;
 	}
@@ -445,50 +506,80 @@ static void ap_decode_access(uint16_t addr, uint8_t RnW)
 		fprintf(stderr, "Read  ");
 	else
 		fprintf(stderr, "Write ");
+
 	if (addr < 0x100) {
-		switch(addr) {
+		switch (addr) {
 		case 0x00:
 			if (RnW)
 				fprintf(stderr, "DP_DPIDR :");
 			else
 				fprintf(stderr, "DP_ABORT :");
 			break;
-		case 0x04: fprintf(stderr, "CTRL/STAT:");
+
+		case 0x04:
+			fprintf(stderr, "CTRL/STAT:");
 			break;
+
 		case 0x08:
 			if (RnW)
 				fprintf(stderr, "RESEND   :");
 			else
 				fprintf(stderr, "DP_SELECT:");
 			break;
-		case 0x0c: fprintf(stderr, "DP_RDBUFF:");
+
+		case 0x0c:
+			fprintf(stderr, "DP_RDBUFF:");
 			break;
-		default: fprintf(stderr, "Unknown %02x   :", addr);
+
+		default:
+			fprintf(stderr, "Unknown %02x   :", addr);
 		}
 	} else {
 		fprintf(stderr, "AP 0x%02x ", addr >> 8);
+
 		switch (addr & 0xff) {
-		case 0x00: fprintf(stderr, "CSW   :");
+		case 0x00:
+			fprintf(stderr, "CSW   :");
 			break;
-		case 0x04: fprintf(stderr, "TAR   :");
+
+		case 0x04:
+			fprintf(stderr, "TAR   :");
 			break;
-		case 0x0c: fprintf(stderr, "DRW   :");
+
+		case 0x0c:
+			fprintf(stderr, "DRW   :");
 			break;
-		case 0x10: fprintf(stderr, "DB0   :");
+
+		case 0x10:
+			fprintf(stderr, "DB0   :");
 			break;
-		case 0x14: fprintf(stderr, "DB1   :");
+
+		case 0x14:
+			fprintf(stderr, "DB1   :");
 			break;
-		case 0x18: fprintf(stderr, "DB2   :");
+
+		case 0x18:
+			fprintf(stderr, "DB2   :");
 			break;
-		case 0x1c: fprintf(stderr, "DB3   :");
+
+		case 0x1c:
+			fprintf(stderr, "DB3   :");
 			break;
-		case 0xf8: fprintf(stderr, "BASE  :");
+
+		case 0xf8:
+			fprintf(stderr, "BASE  :");
 			break;
-		case 0xf4: fprintf(stderr, "CFG   :");
+
+		case 0xf4:
+			fprintf(stderr, "CFG   :");
 			break;
-		case 0xfc: fprintf(stderr, "IDR   :");
+
+		case 0xfc:
+			fprintf(stderr, "IDR   :");
 			break;
-		default:   fprintf(stderr, "RSVD%02x:", addr & 0xff);
+
+		default:
+			fprintf(stderr, "RSVD%02x:", addr & 0xff);
 		}
 	}
 }
@@ -515,17 +606,16 @@ uint32_t adiv5_dp_read(ADIv5_DP_t *dp, uint16_t addr)
 uint32_t adiv5_dp_error(ADIv5_DP_t *dp)
 {
 	uint32_t ret = dp->error(dp);
-	DEBUG_TARGET( "DP Error 0x%08" PRIx32 "\n", ret);
+	DEBUG_TARGET("DP Error 0x%08" PRIx32 "\n", ret);
 	return ret;
 }
 
-uint32_t adiv5_dp_low_access(struct ADIv5_DP_s *dp, uint8_t RnW,
-							 uint16_t addr, uint32_t value)
+uint32_t adiv5_dp_low_access(struct ADIv5_DP_s *dp, uint8_t RnW, uint16_t addr, uint32_t value)
 {
 	uint32_t ret = dp->low_access(dp, RnW, addr, value);
 	if (cl_debuglevel & BMP_DEBUG_TARGET) {
 		ap_decode_access(addr, RnW);
-		fprintf(stderr, " 0x%08" PRIx32 "\n", (RnW)? ret : value);
+		fprintf(stderr, " 0x%08" PRIx32 "\n", RnW ? ret : value);
 	}
 	return ret;
 }
@@ -553,34 +643,40 @@ void adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len)
 {
 	ap->dp->mem_read(ap, dest, src, len);
 	if (cl_debuglevel & BMP_DEBUG_TARGET) {
-		fprintf(stderr, "ap_memread @ %" PRIx32 " len %" PRIx32 ":",
-				src, (uint32_t)len);
-		uint8_t *p = (uint8_t *) dest;
+		fprintf(stderr, "ap_memread @ %" PRIx32 " len %" PRIx32 ":", src, (uint32_t)len);
+		uint8_t *p = (uint8_t *)dest;
 		unsigned int i = len;
+
 		if (i > 16)
 			i = 16;
+
 		while (i--)
 			fprintf(stderr, " %02x", *p++);
+
 		if (len > 16)
 			fprintf(stderr, " ...");
+
 		fprintf(stderr, "\n");
 	}
 	return;
 }
-void adiv5_mem_write_sized(	ADIv5_AP_t *ap, uint32_t dest, const void *src,
-							size_t len, enum align align)
+void adiv5_mem_write_sized(ADIv5_AP_t *ap, uint32_t dest, const void *src, size_t len, enum align align)
 {
 	if (cl_debuglevel & BMP_DEBUG_TARGET) {
-		fprintf(stderr, "ap_mem_write_sized @ %" PRIx32 " len %" PRIx32
-				", align %d:", dest, (uint32_t)len, 1 << align);
-		uint8_t *p = (uint8_t *) src;
+		fprintf(stderr, "ap_mem_write_sized @ %" PRIx32 " len %" PRIx32 ", align %d:", dest, (uint32_t)len, 1 << align);
+
+		uint8_t *p = (uint8_t *)src;
 		unsigned int i = len;
+
 		if (i > 16)
 			i = 16;
+
 		while (i--)
 			fprintf(stderr, " %02x", *p++);
+
 		if (len > 16)
 			fprintf(stderr, " ...");
+
 		fprintf(stderr, "\n");
 	}
 	return ap->dp->mem_write_sized(ap, dest, src, len, align);