diff --git a/gisi/netlink.c b/gisi/netlink.c
index 7ecf2d14..06d4863d 100644
--- a/gisi/netlink.c
+++ b/gisi/netlink.c
@@ -55,18 +55,22 @@
  * fixed macros by Andrzej Zaborowski <balrogg@gmail.com>.
  */
 #undef IFA_RTA
-#define IFA_RTA(r)  ((struct rtattr*)(void*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_RTA(r)  ((struct rtattr *)(void *)(((char *)(r)) \
+	+ NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
 
 #undef IFLA_RTA
-#define IFLA_RTA(r)  ((struct rtattr*)(void *)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+#define IFLA_RTA(r)  ((struct rtattr *)(void *)(((char *)(r)) \
+	+ NLMSG_ALIGN(sizeof(struct ifinfomsg))))
 
 #undef NLMSG_NEXT
-#define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
-	(struct nlmsghdr*)(void*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
+#define NLMSG_NEXT(nlh, len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
+	(struct nlmsghdr *)(void *)(((char *)(nlh)) \
+	+ NLMSG_ALIGN((nlh)->nlmsg_len)))
 
 #undef RTA_NEXT
-#define RTA_NEXT(rta,attrlen)	((attrlen) -= RTA_ALIGN((rta)->rta_len), \
-	(struct rtattr*)(void*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len)))
+#define RTA_NEXT(rta, attrlen)	((attrlen) -= RTA_ALIGN((rta)->rta_len), \
+	(struct rtattr *)(void *)(((char *)(rta)) \
+	+ RTA_ALIGN((rta)->rta_len)))
 
 #define SIZE_NLMSG (16384)
 
@@ -82,7 +86,7 @@ static inline GIsiModem *make_modem(unsigned idx)
 	return (void *)(uintptr_t)idx;
 }
 
-static GSList *netlink_list = NULL;
+static GSList *netlink_list;
 
 GPhonetNetlink *g_pn_netlink_by_modem(GIsiModem *idx)
 {
diff --git a/gisi/server.c b/gisi/server.c
index 97339087..8be109da 100644
--- a/gisi/server.c
+++ b/gisi/server.c
@@ -41,8 +41,7 @@
 #define PN_NAMESERVICE		0xDB
 #define PNS_NAME_ADD_REQ	0x05
 
-struct _GIsiIncoming
-{
+struct _GIsiIncoming {
 	struct sockaddr_pn spn;
 	uint8_t trans_id;
 };