diff --git a/README.md b/README.md
index fc207c924..8463355ac 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # c-lightning: A specification compliant Lightning Network implementation in C
 
 c-lightning is a [standard compliant](https://github.com/lightningnetwork/lightning-rfc) implementation of the Lightning Network protocol.
-The Lightning Network is a scalability solution for Bitcoin, enabling secure and instant transfer of funds between any two party for any amount. 
+The Lightning Network is a scalability solution for Bitcoin, enabling secure and instant transfer of funds between any two party for any amount.
 
 For more information about the Lightning Network please refer to http://lightning.network.
 
@@ -46,7 +46,7 @@ In order to start `lightningd` you will need to have a local `bitcoind` node run
 bitcoind -daemon -testnet
 ```
 
-Wait until `bitcoind` has synchronized with the testnet network. In case you use regtest, make sure you generate at least 432 blocks to activate SegWit. 
+Wait until `bitcoind` has synchronized with the testnet network. In case you use regtest, make sure you generate at least 432 blocks to activate SegWit.
 
 You can start `lightningd` with the following command:
 
@@ -60,7 +60,7 @@ First you need to transfer some funds to `lightningd` so that it can open a chan
 
 ```
 # Returns an address <address>
-cli/lightning-cli newaddr 
+cli/lightning-cli newaddr
 
 # Returns a transaction id <txid>
 bitcoin-cli -testnet sendtoaddress <address> <amount>
diff --git a/closingd/Makefile b/closingd/Makefile
index 09b85f584..6cccb1a7c 100644
--- a/closingd/Makefile
+++ b/closingd/Makefile
@@ -79,4 +79,4 @@ clean: closingd-clean
 closingd-clean:
 	$(RM) $(LIGHTNINGD_CLOSING_OBJS) closingd/gen_*
 
--include closingd/test/Makefile 
+-include closingd/test/Makefile
diff --git a/contrib/pylightning/lightning/lightning.py b/contrib/pylightning/lightning/lightning.py
index a11d0dccb..fee5d6d51 100644
--- a/contrib/pylightning/lightning/lightning.py
+++ b/contrib/pylightning/lightning/lightning.py
@@ -30,7 +30,7 @@ class UnixDomainSocketRpc(object):
                 objs, _ = self.decoder.raw_decode(buff.decode("UTF-8"))
                 return objs
             except ValueError:
-                # Probably didn't read enough 
+                # Probably didn't read enough
                 pass
 
     def __getattr__(self, name):
diff --git a/devtools/bolt11-cli.c b/devtools/bolt11-cli.c
index 6320dcb87..a9bab38d0 100644
--- a/devtools/bolt11-cli.c
+++ b/devtools/bolt11-cli.c
@@ -51,7 +51,7 @@ static char *fmt_time(const tal_t *ctx, u64 time)
 
 	return tal_fmt(ctx, "%.*s", (int)strcspn(p, "\n"), p);
 }
-	
+
 int main(int argc, char *argv[])
 {
 	const tal_t *ctx = tal(NULL, char);
diff --git a/onchaind/Makefile b/onchaind/Makefile
index caf992805..1cf09e2e2 100644
--- a/onchaind/Makefile
+++ b/onchaind/Makefile
@@ -88,4 +88,4 @@ clean: onchaind-clean
 onchaind-clean:
 	$(RM) $(LIGHTNINGD_ONCHAIN_OBJS) onchaind/gen_*
 
--include onchaind/test/Makefile 
+-include onchaind/test/Makefile
diff --git a/openingd/Makefile b/openingd/Makefile
index f7d070d06..d112d7c41 100644
--- a/openingd/Makefile
+++ b/openingd/Makefile
@@ -88,4 +88,4 @@ clean: opening-clean
 opening-clean:
 	$(RM) $(LIGHTNINGD_OPENING_OBJS) openingd/gen_*
 
--include openingd/test/Makefile 
+-include openingd/test/Makefile
diff --git a/tools/generate-wire.py b/tools/generate-wire.py
index 0b866d154..a130c0381 100755
--- a/tools/generate-wire.py
+++ b/tools/generate-wire.py
@@ -163,7 +163,7 @@ class Field(object):
 
     def has_array_helper(self):
         return self.fieldtype.has_array_helper()
-    
+
     # Returns FieldType
     @staticmethod
     def _guess_type(message, fieldname, base_size):
@@ -267,7 +267,7 @@ class Message(object):
         ctx_arg = 'const tal_t *ctx, ' if self.has_variable_fields else ''
 
         args = []
-        
+
         for f in self.fields:
             if f.is_len_var or f.is_padding():
                 continue
diff --git a/tools/mockup.sh b/tools/mockup.sh
index f8a0fc95e..448c99741 100755
--- a/tools/mockup.sh
+++ b/tools/mockup.sh
@@ -22,7 +22,7 @@ for SYMBOL; do
 	echo "/* Could not find declaration for $SYMBOL */"
 	continue
     fi
-	
+
     echo "/* Generated stub for $SYMBOL */"
     FILE=${WHERE%%:*}
     FILE_AND_LINE=${WHERE%:*}