diff --git a/Makefile.am b/Makefile.am
index 1136a6a9..ffccd44a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,9 +139,9 @@ update-manpage: $(top_srcdir)/doc/rofi-manpage.markdown
 ##
 # Rofi test program
 ##
-check_PROGRAMS=rofi_test textbox_test helper_test helper_expand
+check_PROGRAMS=history_test textbox_test helper_test helper_expand
 
-rofi_test_CFLAGS=\
+history_test_CFLAGS=\
 	$(AM_CFLAGS)\
 	$(glib_CFLAGS)\
 	$(libsn_CFLAGS)\
@@ -149,11 +149,11 @@ rofi_test_CFLAGS=\
 	-I$(top_srcdir)/config/\
 	-I$(top_builddir)/
 
-rofi_test_LDADD=\
+history_test_LDADD=\
 	$(glib_LIBS)
 
 
-rofi_test_SOURCES=\
+history_test_SOURCES=\
 	source/history.c\
 	config/config.c\
 	include/rofi.h\
@@ -252,7 +252,7 @@ helper_expand_CFLAGS=${helper_test_CFLAGS}
 helper_expand_LDADD=${helper_test_LDADD}
 
 TESTS=\
-	rofi_test\
+	history_test\
 	helper_test\
 	helper_expand
 
@@ -308,7 +308,7 @@ test-x1: $(bin_PROGRAMS)
 
 
 .PHONY: indent
-indent: $(rofi_SOURCES) $(helper_test_SOURCES) $(textbox_test_SOURCES) $(rofi_test_SOURCES)
+indent: $(rofi_SOURCES) $(helper_test_SOURCES) $(textbox_test_SOURCES) $(history_test_SOURCES) $(helper_expand_SOURCES)
 	uncrustify -c $(top_srcdir)/data/uncrustify.cfg --replace $^
 
 .PHONY: cppcheck
diff --git a/source/dialogs/run.c b/source/dialogs/run.c
index 4b452b09..aa092680 100644
--- a/source/dialogs/run.c
+++ b/source/dialogs/run.c
@@ -401,14 +401,13 @@ static ModeMode run_mode_result ( Mode *sw, int mretv, char **input, unsigned in
         delete_entry ( rmpd->cmd_list[selected_line] );
 
         // Clear the list.
-        retv                  = RELOAD_DIALOG;
+        retv = RELOAD_DIALOG;
         run_mode_destroy ( sw );
         run_mode_init ( sw );
     }
     return retv;
 }
 
-
 static char *_get_display_value ( const Mode *sw, unsigned int selected_line, G_GNUC_UNUSED int *state, int get_entry )
 {
     const RunModePrivateData *rmpd = (const RunModePrivateData *) sw->private_data;
diff --git a/source/view.c b/source/view.c
index 318bca39..e190eab4 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1415,7 +1415,7 @@ static void rofi_view_mainloop_iter ( RofiViewState *state, xcb_generic_event_t
                 state->selected_line = UINT32_MAX;
                 if ( state->selected < state->filtered_lines ) {
                     ( state->selected_line ) = state->line_map[state->selected];
-                    state->retv = MENU_OK;
+                    state->retv              = MENU_OK;
                 }
                 else{
                     // Nothing entered and nothing selected.
diff --git a/source/x11-helper.c b/source/x11-helper.c
index 21ee519b..9a98d507 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -280,8 +280,8 @@ void monitor_active ( workarea *mon )
                     // place the menu above the window
                     // if some window is focused, place menu above window, else fall
                     // back to selected monitor.
-                    mon->x = t->dst_x-r->x;
-                    mon->y = t->dst_y-r->y;
+                    mon->x = t->dst_x - r->x;
+                    mon->y = t->dst_y - r->y;
                     mon->w = r->width;
                     mon->h = r->height;
                     mon->t = r->border_width;
diff --git a/test/helper-expand.c b/test/helper-expand.c
index 39dd6373..e394cac8 100644
--- a/test/helper-expand.c
+++ b/test/helper-expand.c
@@ -73,5 +73,4 @@ int main ( int argc, char ** argv )
     str = rofi_expand_path ( "~root/" );
     TASSERT ( str[0] == '/' );
     g_free ( str );
-
 }