diff --git a/HACKING b/HACKING
index 3b24558a9..830b68841 100644
--- a/HACKING
+++ b/HACKING
@@ -5,8 +5,8 @@
 Git repository
 ---------------------
 
-For interested developers, we have a public repository. To check out and 
-compile the code, you need the following tools:
+For interested developers, we have a public repository. To check out and compile
+the code, you need the following tools:
 
     - Git
     - a recent GNU C compiler (>= 3.x)
@@ -43,7 +43,7 @@ Then you're in, start the build as usual:
 API documentation
 -----------------
 
-Charon and libstrongswan contain inline code documentation. These comments can 
+Charon and libstrongswan contain inline code documentation. These comments can
 be extracted using doxygen. It is built using 'make apidoc', which creates an
 'apidoc' folder containing the HTML files.
 
diff --git a/INSTALL b/INSTALL
index 72c26929a..0cd375ea2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ Contents
     --------
 
     The strongSwan 4.x branch introduces a new build environment featuring
-    GNU autotools. This should simplify the build process and package 
+    GNU autotools. This should simplify the build process and package
     maintenance.
     First check for the availability of required packages on your system
     (section 2.). You may want to include support for additional features, which
@@ -42,9 +42,9 @@ Contents
 
     To check if your kernel fullfills the requirements, see section 4.
 
-    Next add your connections to "/etc/ipsec.conf" and your secrets to 
+    Next add your connections to "/etc/ipsec.conf" and your secrets to
     "/etc/ipsec.secrets". Connections that are to be negotiated by the new
-    IKEv2 charon keying daemon should be designated by "keyexchange=ikev2" and 
+    IKEv2 charon keying daemon should be designated by "keyexchange=ikev2" and
     those by the IKEv1 pluto keying daemon either by "keyexchange=ikev1" or
     the default "keyexchange=ike".
 
@@ -118,7 +118,7 @@ Contents
     ---------------------------------
 
     If you want to securely store your X.509 certificates and private RSA keys
-    on a smart card or a USB crypto token then you will need a PKCS #11 library 
+    on a smart card or a USB crypto token then you will need a PKCS #11 library
     for the smart card of your choice. The OpenSC PKCS#11 library (use
     versions >= 0.9.4) available from http://www.opensc.org/ supports quite a
     selection of cards and tokens (e.g. Aladdin eToken Pro32k, Schlumberger
diff --git a/NEWS b/NEWS
index 795324399..63d717693 100644
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ strongswan-4.6.1
 -  Therefore our approach of computing  integrity checksums for plugins had to be
    changed radically by moving the hash generation from the compilation to the
    post-installation phase.
- 
+
 
 strongswan-4.6.0
 ----------------
diff --git a/src/libstrongswan/crypto/diffie_hellman.h b/src/libstrongswan/crypto/diffie_hellman.h
index aca793b71..cab3b1ba7 100644
--- a/src/libstrongswan/crypto/diffie_hellman.h
+++ b/src/libstrongswan/crypto/diffie_hellman.h
@@ -74,8 +74,7 @@ struct diffie_hellman_t {
 	/**
 	 * Returns the shared secret of this diffie hellman exchange.
 	 *
-	 * Space for returned secret is allocated and must be
-	 * freed by the caller.
+	 * Space for returned secret is allocated and must be freed by the caller.
 	 *
 	 * @param secret	shared secret will be written into this chunk
 	 * @return			SUCCESS, FAILED if not both DH values are set
@@ -108,7 +107,7 @@ struct diffie_hellman_t {
 	diffie_hellman_group_t (*get_dh_group) (diffie_hellman_t *this);
 
 	/**
-	 * Destroys an diffie_hellman_t object.
+	 * Destroys a diffie_hellman_t object.
 	 */
 	void (*destroy) (diffie_hellman_t *this);
 };