diff --git a/Makefile b/Makefile
index 8c77297..0e7258b 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,6 @@ wayland-protocols: src/wayland/protocols/wlr-layer-shell-unstable-v1.xml
 	wayland-scanner private-code ${DATA_DIR_WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml src/wayland/protocols/xdg-output-unstable-v1.h
 	wayland-scanner client-header src/wayland/protocols/wlr-layer-shell-unstable-v1.xml src/wayland/protocols/wlr-layer-shell-unstable-v1-client-header.h
 	wayland-scanner private-code src/wayland/protocols/wlr-layer-shell-unstable-v1.xml src/wayland/protocols/wlr-layer-shell-unstable-v1.h
-	
 
 .PHONY: clean clean-dunst clean-dunstify clean-doc clean-tests clean-coverage clean-coverage-run
 clean: clean-dunst clean-dunstify clean-doc clean-tests clean-coverage clean-coverage-run clean-wayland-protocols
diff --git a/config.mk b/config.mk
index 96413b3..4d1f659 100644
--- a/config.mk
+++ b/config.mk
@@ -42,7 +42,7 @@ pkg_config_packs := gio-2.0 \
                     xext \
                     "xrandr >= 1.5" \
                     xscrnsaver \
-                    wayland-client\
+                    wayland-client \
 
 
 # dunstify also needs libnotify
diff --git a/src/dunst.c b/src/dunst.c
index 4c863ba..b6ff627 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -74,12 +74,10 @@ static gboolean run(void *data)
         bool active = queues_length_displayed() > 0;
 
         if (active) {
-                LOG_D("Dunst: Window is active");
                 // Call draw before showing the window to avoid flickering
                 draw();
                 output->win_show(win);
         } else {
-                LOG_D("Dunst: Window is NOT active");
                 output->win_hide(win);
         }
 
@@ -89,7 +87,7 @@ static gboolean run(void *data)
                 sleep = 100000; // Make sure wayland input is handled in time FIXME
                 gint64 timeout_at = now + sleep;
 
-                LOG_D("Dunst: sleeping for %li ms", sleep/1000);
+                LOG_D("Sleeping for %li ms", sleep/1000);
 
                 if (sleep >= 0) {
                         if (next_timeout < now || timeout_at < next_timeout) {
diff --git a/src/output.c b/src/output.c
index 48f5490..d972d99 100644
--- a/src/output.c
+++ b/src/output.c
@@ -52,12 +52,12 @@ const struct output output_wl = {
 
 const struct output* output_create(void)
 {
-        if (is_running_wayland()){
-                LOG_I("System is running wayland");
+        if (is_running_wayland()) {
+                LOG_I("Using Wayland output");
+                return &output_wl;
+        } else {
+                LOG_I("Using X11 output");
+                return &output_x11;
         }
-        else{
-                LOG_I("System is running X11");
-        }
-        return &output_wl;
 }
 /* vim: set ft=c tabstop=8 shiftwidth=8 expandtab textwidth=0: */
diff --git a/src/queues.c b/src/queues.c
index 8713cde..37e8faa 100644
--- a/src/queues.c
+++ b/src/queues.c
@@ -141,7 +141,6 @@ static bool queues_notification_is_finished(struct notification *n, struct dunst
         if (n->timeout == 0) // sticky
                 return false;
 
-        /* LOG_I("Queues: Still checking if notification is finished"); */
         bool is_idle = status.fullscreen ? false : status.idle;
 
         /* don't timeout when user is idle */
diff --git a/src/wayland/wl.c b/src/wayland/wl.c
index 0864237..7e557dd 100644
--- a/src/wayland/wl.c
+++ b/src/wayland/wl.c
@@ -173,7 +173,6 @@ static void destroy_output(struct wl_output *output) {
 
 static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
                 uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
-        LOG_I("Pointer handle motion");
         ctx.pointer.x = wl_fixed_to_int(surface_x);
         ctx.pointer.y = wl_fixed_to_int(surface_y);
 }
@@ -651,7 +650,7 @@ void wl_win_show(window win) {
 }
 
 void wl_win_hide(window win) {
-        LOG_I("Hiding window");
+        LOG_I("Wayland: Hiding window");
         ctx.cur_dim.h = 0;
         set_dirty();
         wl_display_roundtrip(ctx.display);