diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
index bf713b3d9..99d68643f 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
@@ -117,12 +117,12 @@ public class ConfiguredGuacamoleSocket implements GuacamoleSocket {
         // Wait for server args
         GuacamoleInstruction instruction;
         do {
-            
+
             // Read instruction, fail if end-of-stream
             instruction = reader.readInstruction();
             if (instruction == null)
                 throw new GuacamoleServerException("End of stream during initial handshake.");
-            
+
         } while (!instruction.getOpcode().equals("args"));
 
         // Build args list off provided names and config
@@ -144,7 +144,7 @@ public class ConfiguredGuacamoleSocket implements GuacamoleSocket {
 
         }
 
-        // Send size 
+        // Send size
         writer.writeInstruction(
             new GuacamoleInstruction(
                 "size",
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java
index 424fc598c..c2fc48c48 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java
@@ -58,12 +58,12 @@ public class GuacamoleClientInformation {
      * The optimal screen height requested by the client, in pixels.
      */
     private int optimalScreenHeight = 768;
-  
+
     /**
      * The list of audio mimetypes reported by the client to be supported.
      */
     private List<String> audioMimetypes = new ArrayList<String>();
-  
+
     /**
      * The list of audio mimetypes reported by the client to be supported.
      */
@@ -105,7 +105,7 @@ public class GuacamoleClientInformation {
      * Returns the list of audio mimetypes supported by the client. To add or
      * removed supported mimetypes, the list returned by this function can be
      * modified.
-     * 
+     *
      * @return The set of audio mimetypes supported by the client.
      */
     public List<String> getAudioMimetypes() {
@@ -116,7 +116,7 @@ public class GuacamoleClientInformation {
      * Returns the list of video mimetypes supported by the client. To add or
      * removed supported mimetypes, the list returned by this function can be
      * modified.
-     * 
+     *
      * @return The set of video mimetypes supported by the client.
      */
     public List<String> getVideoMimetypes() {
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
index 2e67a9cca..ac56fb315 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
@@ -104,18 +104,18 @@ public class GuacamoleConfiguration implements Serializable {
 
     /**
      * Removes the value set for the parameter with the given name.
-     * 
+     *
      * @param name The name of the parameter to remove the value of.
      */
     public void unsetParameter(String name) {
         parameters.remove(name);
     }
-    
+
     /**
      * Returns a set of all currently defined parameter names. Each name
      * corresponds to a parameter that has a value set on this
      * GuacamoleConfiguration via setParameter().
-     * 
+     *
      * @return A set of all currently defined parameter names.
      */
     public Set<String> getParameterNames() {
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 7ab97d0d2..1c178e063 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -164,7 +164,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
                     try {
                         // Ensure buggy browsers do not cache response
                         response.setHeader("Cache-Control", "no-cache");
-                        
+
                         // Send UUID to client
                         response.getWriter().print(tunnel.getUUID().toString());
                     }
@@ -403,12 +403,12 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
                 // Buffer
                 int length;
                 char[] buffer = new char[8192];
-                
+
                 // Transfer data using buffer
                 while (tunnel.isOpen() &&
                         (length = input.read(buffer, 0, buffer.length)) != -1)
                     writer.write(buffer, 0, length);
-                
+
             }
 
             // Close input stream in all cases