diff --git a/.gitignore b/.gitignore
index c2dd2fa..25ca48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,11 @@ src/*.o
 src/files.h
 src/filetypes.h
 src/functions.h
+src/bin2c
+src/gophernicus
+
 README
 README.options
-bin2c
-gophernicus
 
 #
 # Test leftovers
diff --git a/.travis.yml b/.travis.yml
index 9e17a16..cbccdb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ git:
 os:
   - linux
   - osx
-  
+
 compiler:
   - clang
   - gcc
diff --git a/README.gophermap b/README.gophermap
index e06ca87..e889d5d 100644
--- a/README.gophermap
+++ b/README.gophermap
@@ -69,7 +69,7 @@ Additional type characters supported by Gophernicus:
 
 Examples of valid resource lines:
 
-1subdir	
+1subdir
 1Relative internal link	subdir
 1Absolute internal link	/subdir
 1External link 	/	gopher.floodgap.com	70
@@ -106,4 +106,3 @@ Execute script and parse output as subgophermap:
 
 Here we stop processing the gophermap and include the regular menu:
 *
-
diff --git a/debian/rules b/debian/rules
index f5b5407..c71b1d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ binary-arch: build install
 	dh_installdocs
 #	dh_install
 #	dh_installmenu
-	dh_installdebconf	
+	dh_installdebconf
 	dh_installlogrotate
 	dh_installlogcheck
 #	dh_installemacsen
diff --git a/src/file.c b/src/file.c
index c501f91..9910285 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,5 +1,5 @@
 /*
- * Gophernicus 
+ * Gophernicus
  *
  * Copyright (c) 2009-2018 Kim Holviala <kimholviala@fastmail.com>
  * Copyright (c) 2019 Gophernicus Developers <gophernicus@gophernicus.org>
@@ -397,7 +397,7 @@ void gopher_file(state *st)
 
 	if (strcmp(c, st->map_file) == MATCH)
 		die(st, ERR_ACCESS, "Refusing to serve out a gophermap file");
-	if (strcmp(c, st->tag_file) == MATCH)	
+	if (strcmp(c, st->tag_file) == MATCH)
 		die(st, ERR_ACCESS, "Refusing to serve out a gophertag file");
 
 	/* Check for & run CGI and query scripts */
diff --git a/src/gophernicus.h b/src/gophernicus.h
index 9211ec7..9ae42f6 100644
--- a/src/gophernicus.h
+++ b/src/gophernicus.h
@@ -1,5 +1,5 @@
 /*
- * Gophernicus 
+ * Gophernicus
  *
  * Copyright (c) 2009-2018 Kim Holviala <kimholviala@fastmail.com>
  * Copyright (c) 2019 Gophernicus Developers <gophernicus@gophernicus.org>
@@ -214,7 +214,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
 #define DEFAULT_TAG		"gophertag"
 #define DEFAULT_CGI		"/cgi-bin/"
 #define DEFAULT_USERDIR		"public_gopher"
-#define DEFAULT_WIDTH       67	
+#define DEFAULT_WIDTH       67
 #define DEFAULT_CHARSET		UTF_8
 #define MIN_WIDTH		33
 #define MAX_WIDTH		200
diff --git a/src/menu.c b/src/menu.c
index 083d352..aa4a0d8 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,5 @@
 /*
- * Gophernicus 
+ * Gophernicus
  *
  * Copyright (c) 2009-2018 Kim Holviala <kimholviala@fastmail.com>
  * Copyright (c) 2019 Gophernicus Developers <gophernicus@gophernicus.org>
diff --git a/src/string.c b/src/string.c
index 027a863..dcc4d58 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1,5 +1,5 @@
 /*
- * Gophernicus 
+ * Gophernicus
  *
  * Copyright (c) 2009-2018 Kim Holviala <kimholviala@fastmail.com>
  * Copyright (c) 2019 Gophernicus Developers <gophernicus@gophernicus.org>