diff --git a/dwmblocks.c b/dwmblocks.c
index a811f76..df567c6 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -1,33 +1,36 @@
-#include<stdlib.h>
-#include<stdio.h>
-#include<string.h>
-#include<unistd.h>
-#include<signal.h>
-#include<sys/wait.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 #ifndef NO_X
-#include<X11/Xlib.h>
+#include <X11/Xlib.h>
 #endif
 #ifdef __OpenBSD__
-#define SIGPLUS			SIGUSR1+1
-#define SIGMINUS		SIGUSR1-1
+#define SIGPLUS SIGUSR1 + 1
+#define SIGMINUS SIGUSR1 - 1
 #else
-#define SIGPLUS			SIGRTMIN
-#define SIGMINUS		SIGRTMIN
+#define SIGPLUS SIGRTMIN
+#define SIGMINUS SIGRTMIN
 #endif
-#define LENGTH(X)               (sizeof(X) / sizeof (X[0]))
-#define CMDLENGTH		50
-#define MIN( a, b ) ( ( a < b) ? a : b )
+#define LENGTH(X) (sizeof(X) / sizeof(X[0]))
+#define CMDLENGTH 50
+#define MIN(a, b) ((a < b) ? a : b)
 #define STATUSLENGTH (LENGTH(blocks) * CMDLENGTH + 1)
 
 typedef struct {
-	char* icon;
-	char* command;
-	unsigned int interval;
-	unsigned int signal;
+  char *icon;
+  char *command;
+  unsigned int interval;
+  unsigned int signal;
 } Block;
 #ifndef __OpenBSD__
 void dummysighandler(int num);
 #endif
+void remove_all(char *str, char to_remove);
 void getcmds(int time);
 void getsigcmds(unsigned int signal);
 void setupsignals();
@@ -39,16 +42,15 @@ void chldhandler();
 void pstdout();
 #ifndef NO_X
 void setroot();
-static void (*writestatus) () = setroot;
+static void (*writestatus)() = setroot;
 static int setupX();
 static Display *dpy;
 static int screen;
 static Window root;
 #else
-static void (*writestatus) () = pstdout;
+static void (*writestatus)() = pstdout;
 #endif
 
-
 #include "blocks.h"
 
 static char statusbar[LENGTH(blocks)][CMDLENGTH] = {0};
@@ -56,192 +58,203 @@ static char statusstr[2][STATUSLENGTH];
 static int statusContinue = 1;
 static int returnStatus = 0;
 
-//opens process *cmd and stores output in *output
-void getcmd(const Block *block, char *output)
-{
-	if (block->signal)
-		*output++ = block->signal;
-	strcpy(output, block->icon);
-	FILE *cmdf = popen(block->command, "r");
-	if (!cmdf)
-		return;
-	int i = strlen(block->icon);
-	fgets(output+i, CMDLENGTH-i-delimLen, cmdf);
-	i = strlen(output);
-	if (i == 0) {
-		//return if block and command output are both empty
-		pclose(cmdf);
-		return;
-	}
-	//only chop off newline if one is present at the end
-	i = output[i-1] == '\n' ? i-1 : i;
-	if (delim[0] != '\0') {
-		strncpy(output+i, delim, delimLen); 
-	}
-	else
-		output[i++] = '\0';
-	pclose(cmdf);
+void remove_all(char *str, char to_remove) {
+  char *read = str;
+  char *write = str;
+
+  do {
+    while (*read == to_remove)
+      read++;
+    *write++ = *read;
+    read++;
+  } while (*(read - 1));
 }
 
-void getcmds(int time)
-{
-	const Block* current;
-	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
-		current = blocks + i;
-		if ((current->interval != 0 && time % current->interval == 0) || time == -1)
-			getcmd(current,statusbar[i]);
-	}
+// opens process *cmd and stores output in *output
+void getcmd(const Block *block, char *output) {
+  if (block->signal)
+    *output++ = block->signal;
+  FILE *cmdf = popen(block->command, "r");
+  if (!cmdf) {
+    printf("failed to run: %s, %d\n", block->command, errno);
+    return;
+  }
+  char tmpstr[CMDLENGTH] = "";
+  char *s;
+  int e;
+  do {
+    s = fgets(tmpstr, CMDLENGTH - (strlen(delim) + 1), cmdf);
+    e = errno;
+  } while (!s && e == EINTR);
+  pclose(cmdf);
+  int i = strlen(block->icon);
+  strcpy(output, block->icon);
+  strcpy(output + i, tmpstr);
+  remove_all(output, '\n');
+  i = strlen(output);
+  if ((i > 0 && block != &blocks[LENGTH(blocks) - 1])) {
+    strcat(output, delim);
+  }
+  i += strlen(delim);
+  output[i++] = '\0';
 }
 
-void getsigcmds(unsigned int signal)
-{
-	const Block *current;
-	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
-		current = blocks + i;
-		if (current->signal == signal)
-			getcmd(current,statusbar[i]);
-	}
+void getcmds(int time) {
+  const Block *current;
+  for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+    current = blocks + i;
+    if ((current->interval != 0 && time % current->interval == 0) || time == -1)
+      getcmd(current, statusbar[i]);
+  }
 }
 
-void setupsignals()
-{
-	struct sigaction sa = { .sa_sigaction = sighandler, .sa_flags = SA_SIGINFO };
+void getsigcmds(unsigned int signal) {
+  const Block *current;
+  for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+    current = blocks + i;
+    if (current->signal == signal)
+      getcmd(current, statusbar[i]);
+  }
+}
+
+void setupsignals() {
+  struct sigaction sa = {.sa_sigaction = sighandler, .sa_flags = SA_SIGINFO};
 #ifndef __OpenBSD__
-	    /* initialize all real time signals with dummy handler */
-    for (int i = SIGRTMIN; i <= SIGRTMAX; i++) {
-        signal(i, dummysighandler);
-		sigaddset(&sa.sa_mask, i);
-	}
+  /* initialize all real time signals with dummy handler */
+  for (int i = SIGRTMIN; i <= SIGRTMAX; i++) {
+    signal(i, dummysighandler);
+    sigaddset(&sa.sa_mask, i);
+  }
 #endif
 
-	for (unsigned int i = 0; i < LENGTH(blocks); i++) {
-		if (blocks[i].signal > 0)
-			sigaction(SIGMINUS+blocks[i].signal, &sa, NULL);
-	}
-
+  for (unsigned int i = 0; i < LENGTH(blocks); i++) {
+    if (blocks[i].signal > 0)
+      sigaction(SIGMINUS + blocks[i].signal, &sa, NULL);
+  }
 }
 
-int getstatus(char *str, char *last)
-{
-	strcpy(last, str);
-	str[0] = '\0';
-	for (unsigned int i = 0; i < LENGTH(blocks); i++)
-		strcat(str, statusbar[i]);
-	str[strlen(str)-strlen(delim)] = '\0';
-	return strcmp(str, last);//0 if they are the same
+int getstatus(char *str, char *last) {
+  strcpy(last, str);
+  str[0] = '\0';
+  for (unsigned int i = 0; i < LENGTH(blocks); i++)
+    strcat(str, statusbar[i]);
+  str[strlen(str) - strlen(delim)] = '\0';
+  return strcmp(str, last); // 0 if they are the same
 }
 
 #ifndef NO_X
-void setroot()
-{
-	if (!getstatus(statusstr[0], statusstr[1]))//Only set root if text has changed.
-		return;
-	XStoreName(dpy, root, statusstr[0]);
-	XFlush(dpy);
+void setroot() {
+  if (!getstatus(statusstr[0],
+                 statusstr[1])) // Only set root if text has changed.
+    return;
+  XStoreName(dpy, root, statusstr[0]);
+  XFlush(dpy);
 }
 
-int setupX()
-{
-	dpy = XOpenDisplay(NULL);
-	if (!dpy) {
-		fprintf(stderr, "dwmblocks: Failed to open display\n");
-		return 0;
-	}
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	return 1;
+int setupX() {
+  dpy = XOpenDisplay(NULL);
+  if (!dpy) {
+    fprintf(stderr, "dwmblocks: Failed to open display\n");
+    return 0;
+  }
+  screen = DefaultScreen(dpy);
+  root = RootWindow(dpy, screen);
+  return 1;
 }
 #endif
 
-void pstdout()
-{
-	if (!getstatus(statusstr[0], statusstr[1]))//Only write out if text has changed.
-		return;
-	printf("%s\n",statusstr[0]);
-	fflush(stdout);
+void pstdout() {
+  if (!getstatus(statusstr[0],
+                 statusstr[1])) // Only write out if text has changed.
+    return;
+  printf("%s\n", statusstr[0]);
+  fflush(stdout);
 }
 
-
-void statusloop()
-{
-	setupsignals();
-	int i = 0;
-	getcmds(-1);
-	while (1) {
-		getcmds(i++);
-		writestatus();
-		if (!statusContinue)
-			break;
-		sleep(1.0);
-	}
+void statusloop() {
+  setupsignals();
+  int i = 0;
+  int gotscrewed = 0;
+  struct timespec sleeptime = {1, 0};
+  struct timespec tosleep = sleeptime;
+  getcmds(-1);
+  while (1) {
+    // sleep for tosleep (should be sleeptime of 1s) and put what was left if
+    // interrupted back into tosleep
+    gotscrewed = nanosleep(&tosleep, &tosleep);
+    // if interrupted then go back to sleep for remaining time
+    if (gotscrewed == -1) {
+      continue;
+    }
+    getcmds(i++);
+    writestatus();
+    if (!statusContinue)
+      break;
+    tosleep = sleeptime;
+  }
 }
 
 #ifndef __OpenBSD__
 /* this signal handler should do nothing */
-void dummysighandler(int signum)
-{
-    return;
-}
+void dummysighandler(int signum) { return; }
 #endif
 
-void sighandler(int signum, siginfo_t *si, void *ucontext)
-{
-	if (si->si_value.sival_int) {
-		pid_t parent = getpid();
-		if (fork() == 0) {
+void sighandler(int signum, siginfo_t *si, void *ucontext) {
+  if (si->si_value.sival_int) {
+    pid_t parent = getpid();
+    if (fork() == 0) {
 #ifndef NO_X
-			if (dpy)
-				close(ConnectionNumber(dpy));
+      if (dpy)
+        close(ConnectionNumber(dpy));
 #endif
-			int i;
-			for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum-SIGRTMIN; i++);
+      int i;
+      for (i = 0; i < LENGTH(blocks) && blocks[i].signal != signum - SIGRTMIN;
+           i++)
+        ;
 
-			char shcmd[1024];
-			sprintf(shcmd, "%s; kill -%d %d", blocks[i].command, SIGRTMIN+blocks[i].signal, parent);
-			char *cmd[] = { "/bin/sh", "-c", shcmd, NULL };
-			char button[2] = { '0' + si->si_value.sival_int, '\0' };
-			setenv("BUTTON", button, 1);
-			setsid();
-			execvp(cmd[0], cmd);
-			perror(cmd[0]);
-			exit(EXIT_SUCCESS);
-		}
-	} else {
-		getsigcmds(signum-SIGPLUS);
-		writestatus();
-	}
+      char shcmd[1024];
+      sprintf(shcmd, "%s; kill -%d %d", blocks[i].command,
+              SIGRTMIN + blocks[i].signal, parent);
+      char *cmd[] = {"/bin/sh", "-c", shcmd, NULL};
+      char button[2] = {'0' + si->si_value.sival_int, '\0'};
+      setenv("BUTTON", button, 1);
+      setsid();
+      execvp(cmd[0], cmd);
+      perror(cmd[0]);
+      exit(EXIT_SUCCESS);
+    }
+  } else {
+    getsigcmds(signum - SIGPLUS);
+    writestatus();
+  }
 }
 
-void termhandler()
-{
-	statusContinue = 0;
+void termhandler() { statusContinue = 0; }
+
+void chldhandler() {
+  while (0 < waitpid(-1, NULL, WNOHANG))
+    ;
 }
 
-void chldhandler()
-{
-	while (0 < waitpid(-1, NULL, WNOHANG));
-}
-
-int main(int argc, char** argv)
-{
-	for (int i = 0; i < argc; i++) {//Handle command line arguments
-		if (!strcmp("-d",argv[i]))
-			strncpy(delim, argv[++i], delimLen);
-		else if (!strcmp("-p",argv[i]))
-			writestatus = pstdout;
-	}
+int main(int argc, char **argv) {
+  for (int i = 0; i < argc; i++) { // Handle command line arguments
+    if (!strcmp("-d", argv[i]))
+      strncpy(delim, argv[++i], delimLen);
+    else if (!strcmp("-p", argv[i]))
+      writestatus = pstdout;
+  }
 #ifndef NO_X
-	if (!setupX())
-		return 1;
+  if (!setupX())
+    return 1;
 #endif
-	delimLen = MIN(delimLen, strlen(delim));
-	delim[delimLen++] = '\0';
-	signal(SIGTERM, termhandler);
-	signal(SIGINT, termhandler);
-	signal(SIGCHLD, chldhandler);
-	statusloop();
+  delimLen = MIN(delimLen, strlen(delim));
+  delim[delimLen++] = '\0';
+  signal(SIGTERM, termhandler);
+  signal(SIGINT, termhandler);
+  signal(SIGCHLD, chldhandler);
+  statusloop();
 #ifndef NO_X
-	XCloseDisplay(dpy);
+  XCloseDisplay(dpy);
 #endif
-	return 0;
+  return 0;
 }