diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index 6606faf09..46345e00b 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -154,4 +154,4 @@ public class BasicFileAuthenticationProvider extends SimpleAuthenticationProvide
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java
index 91147a513..241e571d1 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/auth/Authorization.java
@@ -1,12 +1,5 @@
 package net.sourceforge.guacamole.net.basic.auth;
 
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Map;
-import java.util.TreeMap;
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
-
 /*
  *  Guacamole - Clientless Remote Desktop
  *  Copyright (C) 2010  Michael Jumper
@@ -25,6 +18,13 @@ import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Map;
+import java.util.TreeMap;
+import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+
 /**
  * Mapping of username/password pair to configuration set. In addition to basic
  * storage of the username, password, and configurations, this class also
@@ -100,7 +100,7 @@ public class Authorization {
         // Convert each byte into a pair of hex digits
         for (byte b : bytes) {
             hex.append(HEX_CHARS[(b & 0xF0) >> 4])
-               .append(HEX_CHARS[(b & 0x0F)     ]);
+               .append(HEX_CHARS[ b & 0x0F      ]);
         }
 
         // Return the string produced
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
index 95b38275c..b46da4281 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/xml/DocumentHandler.java
@@ -18,6 +18,7 @@ package net.sourceforge.guacamole.net.basic.xml;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import java.util.Deque;
 import java.util.LinkedList;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -49,7 +50,7 @@ public class DocumentHandler extends DefaultHandler {
      * parsed at that level of the document, where the current element is
      * last in the stack, and the root element is first.
      */
-    private LinkedList<DocumentHandlerState> stack =
+    private Deque<DocumentHandlerState> stack =
             new LinkedList<DocumentHandlerState>();
 
     /**