diff --git a/lib/advio.c b/lib/advio.c
index 08520e4d5..1fac70d97 100644
--- a/lib/advio.c
+++ b/lib/advio.c
@@ -47,24 +47,31 @@ static int advio_trace(CURL *handle, curl_infotype type, char *data, size_t size
 		case CURLINFO_TEXT:
 			text = "info";
 			break;
+
 		case CURLINFO_HEADER_OUT:
 			text = "send header";
 			break;
+
 		case CURLINFO_DATA_OUT:
 			text = "send data";
 			break;
+
 		case CURLINFO_HEADER_IN:
 			text = "recv header";
 			break;
+
 		case CURLINFO_DATA_IN:
 			text = "recv data";
 			break;
+
 		case CURLINFO_SSL_DATA_IN:
 			text = "recv SSL data";
 			break;
+
 		case CURLINFO_SSL_DATA_OUT:
 			text = "send SSL data";
 			break;
+
 		default: /* in case a new one is introduced to shock us */
 			return 0;
 	}
diff --git a/lib/config_helper.c b/lib/config_helper.c
index 2e3cb8f1a..cb5edc140 100644
--- a/lib/config_helper.c
+++ b/lib/config_helper.c
@@ -31,14 +31,25 @@
 static int json_to_config_type(int type)
 {
 	switch (type) {
-		case JSON_OBJECT:	return CONFIG_TYPE_GROUP;
-		case JSON_ARRAY:	return CONFIG_TYPE_LIST;
-		case JSON_STRING:	return CONFIG_TYPE_STRING;
-		case JSON_INTEGER:	return CONFIG_TYPE_INT64;
-		case JSON_REAL:		return CONFIG_TYPE_FLOAT;
+		case JSON_OBJECT:
+			return CONFIG_TYPE_GROUP;
+
+		case JSON_ARRAY:
+			return CONFIG_TYPE_LIST;
+
+		case JSON_STRING:
+			return CONFIG_TYPE_STRING;
+
+		case JSON_INTEGER:
+			return CONFIG_TYPE_INT64;
+
+		case JSON_REAL:
+			return CONFIG_TYPE_FLOAT;
+
 		case JSON_TRUE:
 		case JSON_FALSE:
-		case JSON_NULL:		return CONFIG_TYPE_BOOL;
+		case JSON_NULL:
+			return CONFIG_TYPE_BOOL;
 	}
 
 	return -1;
@@ -47,11 +58,20 @@ static int json_to_config_type(int type)
 json_t * config_to_json(config_setting_t *cfg)
 {
 	switch (config_setting_type(cfg)) {
-		case CONFIG_TYPE_INT:	 return json_integer(config_setting_get_int(cfg));
-		case CONFIG_TYPE_INT64:	 return json_integer(config_setting_get_int64(cfg));
-		case CONFIG_TYPE_FLOAT:  return json_real(config_setting_get_float(cfg));
-		case CONFIG_TYPE_STRING: return json_string(config_setting_get_string(cfg));
-		case CONFIG_TYPE_BOOL:	 return json_boolean(config_setting_get_bool(cfg));
+		case CONFIG_TYPE_INT:
+			return json_integer(config_setting_get_int(cfg));
+
+		case CONFIG_TYPE_INT64:
+			return json_integer(config_setting_get_int64(cfg));
+
+		case CONFIG_TYPE_FLOAT:
+			return json_real(config_setting_get_float(cfg));
+
+		case CONFIG_TYPE_STRING:
+			return json_string(config_setting_get_string(cfg));
+
+		case CONFIG_TYPE_BOOL:
+			return json_boolean(config_setting_get_bool(cfg));
 
 		case CONFIG_TYPE_ARRAY:
 		case CONFIG_TYPE_LIST: {
diff --git a/lib/nodes/socket.c b/lib/nodes/socket.c
index 0f889a669..63ffd8557 100644
--- a/lib/nodes/socket.c
+++ b/lib/nodes/socket.c
@@ -134,10 +134,21 @@ char * socket_print(struct node *n)
 	char *layer = NULL, *buf;
 
 	switch (s->layer) {
-		case SOCKET_LAYER_UDP:	layer = "udp";	break;
-		case SOCKET_LAYER_IP:	layer = "ip";	break;
-		case SOCKET_LAYER_ETH:	layer = "eth";	break;
-		case SOCKET_LAYER_UNIX:	layer = "unix";	break;
+		case SOCKET_LAYER_UDP:
+			layer = "udp";
+			break;
+
+		case SOCKET_LAYER_IP:
+			layer = "ip";
+			break;
+
+		case SOCKET_LAYER_ETH:
+			layer = "eth";
+			break;
+
+		case SOCKET_LAYER_UNIX:
+			layer = "unix";
+			break;
 	}
 
 	char *local = socket_print_addr((struct sockaddr *) &s->local);
@@ -207,12 +218,24 @@ int socket_start(struct node *n)
 
 	/* Create socket */
 	switch (s->layer) {
-		case SOCKET_LAYER_UDP:	s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM,	IPPROTO_UDP); break;
-		case SOCKET_LAYER_IP:	s->sd = socket(s->local.sa.sa_family, SOCK_RAW,		ntohs(s->local.sin.sin_port)); break;
+		case SOCKET_LAYER_UDP:
+			s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
+			break;
+
+		case SOCKET_LAYER_IP:
+			s->sd = socket(s->local.sa.sa_family, SOCK_RAW, ntohs(s->local.sin.sin_port));
+			break;
+
 #ifdef __linux__
-		case SOCKET_LAYER_ETH:	s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM,	s->local.sll.sll_protocol); break;
+		case SOCKET_LAYER_ETH:
+			s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM, s->local.sll.sll_protocol);
+			break;
 #endif /* __linux__ */
-		case SOCKET_LAYER_UNIX:	s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM,	0); break;
+
+		case SOCKET_LAYER_UNIX:
+			s->sd = socket(s->local.sa.sa_family, SOCK_DGRAM, 0);
+			break;
+
 		default:
 			error("Invalid socket type!");
 	}
@@ -230,13 +253,25 @@ int socket_start(struct node *n)
 	/* Bind socket for receiving */
 	socklen_t addrlen = 0;
 	switch(s->local.ss.ss_family) {
-		case AF_INET:   addrlen = sizeof(struct sockaddr_in); break;
-		case AF_INET6:  addrlen = sizeof(struct sockaddr_in6); break;
-		case AF_UNIX:   addrlen = SUN_LEN(&s->local.sun); break;
+		case AF_INET:
+			addrlen = sizeof(struct sockaddr_in);
+			break;
+
+		case AF_INET6:
+			addrlen = sizeof(struct sockaddr_in6);
+			break;
+
+		case AF_UNIX:
+			addrlen = SUN_LEN(&s->local.sun);
+			break;
+
 #ifdef __linux__
-		case AF_PACKET: addrlen = sizeof(struct sockaddr_ll); break;
+		case AF_PACKET:
+			addrlen = sizeof(struct sockaddr_ll);
+			break;
 #endif
-		default:        addrlen = sizeof(s->local); break;
+		default:
+			addrlen = sizeof(s->local);
 	}
 
 	ret = bind(s->sd, (struct sockaddr *) &s->local, addrlen);
@@ -386,8 +421,13 @@ int socket_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r
 	 * So we simply set it ourself. */
 	if (s->layer == SOCKET_LAYER_IP) {
 		switch (src.sa.sa_family) {
-			case AF_INET:  src.sin.sin_port   = s->remote.sin.sin_port;   break;
-			case AF_INET6: src.sin6.sin6_port = s->remote.sin6.sin6_port; break;
+			case AF_INET:
+				src.sin.sin_port = s->remote.sin.sin_port;
+				break;
+
+			case AF_INET6:
+				src.sin6.sin6_port = s->remote.sin6.sin6_port;
+				break;
 		}
 	}
 
@@ -441,13 +481,25 @@ retry:	ret = io_sprint(&s->io, buf, buflen, &wbytes, smps, cnt);
 	/* Send message */
 	socklen_t addrlen = 0;
 	switch(s->local.ss.ss_family) {
-		case AF_INET:   addrlen = sizeof(struct sockaddr_in); break;
-		case AF_INET6:  addrlen = sizeof(struct sockaddr_in6); break;
-		case AF_UNIX:   addrlen = SUN_LEN(&s->local.sun); break;
+		case AF_INET:
+			addrlen = sizeof(struct sockaddr_in);
+			break;
+
+		case AF_INET6:
+			addrlen = sizeof(struct sockaddr_in6);
+			break;
+
+		case AF_UNIX:
+			addrlen = SUN_LEN(&s->local.sun);
+			break;
+
 #ifdef __linux__
-		case AF_PACKET: addrlen = sizeof(struct sockaddr_ll); break;
+		case AF_PACKET:
+			addrlen = sizeof(struct sockaddr_ll);
+			break;
 #endif
-		default:        addrlen = sizeof(s->local); break;
+		default:
+			addrlen = sizeof(s->local);
 	}
 
 	bytes = sendto(s->sd, buf, wbytes, MSG_DONTWAIT, (struct sockaddr *) &s->remote, addrlen);
diff --git a/lib/web.c b/lib/web.c
index c8cc06c4a..161b9d99d 100644
--- a/lib/web.c
+++ b/lib/web.c
@@ -144,12 +144,24 @@ static void logger(int level, const char *msg) {
 		level = LLL_WARN;
 
 	switch (level) {
-		case LLL_ERR:		log_print(global_log, CLR_RED("Web  "), "%.*s", len, msg); break;
-		case LLL_WARN:		log_print(global_log, CLR_YEL("Web  "), "%.*s", len, msg); break;
-		case LLL_NOTICE:	log_print(global_log, CLR_WHT("Web  "), "%.*s", len, msg); break;
-		case LLL_INFO:		log_print(global_log,         "Web  ",  "%.*s", len, msg); break;
+		case LLL_ERR:
+			log_print(global_log, CLR_RED("Web  "), "%.*s", len, msg);
+			break;
+
+		case LLL_WARN:
+			log_print(global_log, CLR_YEL("Web  "), "%.*s", len, msg);
+			break;
+
+		case LLL_NOTICE:
+			log_print(global_log, CLR_WHT("Web  "), "%.*s", len, msg);
+			break;
+
+		case LLL_INFO:
+			log_print(global_log,         "Web  ",  "%.*s", len, msg);
+			break;
+
 		default: /* Everything else is debug */
-					log_print(global_log, CLR_GRY("Web  "), "%.*s", len, msg); break;
+			log_print(global_log, CLR_GRY("Web  "), "%.*s", len, msg); break;
 	}
 }