diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java
index 1d0f3bf70..60d5101c0 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Credentials.java
@@ -52,11 +52,6 @@ import javax.servlet.http.HttpSession;
  */
 public class Credentials implements Serializable {
 
-    /**
-     * The version number of this class, used during serialization.
-     *
-     * @see Serializable
-     */
     private static final long serialVersionUID = 1L;
 
     /**
@@ -93,7 +88,7 @@ public class Credentials implements Serializable {
      * @param password The password to associate with this username/password
      *                 pair.
      */
-    public void setPassword(final String password) {
+    public void setPassword(String password) {
         this.password = password;
     }
 
@@ -111,7 +106,7 @@ public class Credentials implements Serializable {
      * @param username The username to associate with this username/password
      *                 pair.
      */
-    public void setUsername(final String username) {
+    public void setUsername(String username) {
         this.username = username;
     }
 
@@ -129,7 +124,7 @@ public class Credentials implements Serializable {
      * @param request  The HttpServletRequest to associated with this set of
      *                 credentials.
      */
-    public void setRequest(final HttpServletRequest request) {
+    public void setRequest(HttpServletRequest request) {
         this.request = request;
     }
 
@@ -147,7 +142,7 @@ public class Credentials implements Serializable {
      * @param session The HttpSession to associated with this set of
      *                credentials.
      */
-    public void setSession(final HttpSession session) {
+    public void setSession(HttpSession session) {
         this.session = session;
     }
 
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java
index d6bfcd298..6ce8b5c3a 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationFailureEvent.java
@@ -22,7 +22,7 @@ public class AuthenticationFailureEvent implements CredentialEvent {
      *
      * @param credentials The credentials which failed authentication.
      */
-    public AuthenticationFailureEvent(final Credentials credentials) {
+    public AuthenticationFailureEvent(Credentials credentials) {
         this.credentials = credentials;
     }
 
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java
index de9e75556..80986fd6c 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/AuthenticationSuccessEvent.java
@@ -22,7 +22,7 @@ public class AuthenticationSuccessEvent implements CredentialEvent {
      *
      * @param credentials The credentials which passed authentication.
      */
-    public AuthenticationSuccessEvent(final Credentials credentials) {
+    public AuthenticationSuccessEvent(Credentials credentials) {
         this.credentials = credentials;
     }
 
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java
index 21ea6c0c0..d89715514 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelCloseEvent.java
@@ -32,9 +32,7 @@ public class TunnelCloseEvent implements CredentialEvent, TunnelEvent {
      *                    closing the tunnel.
      * @param tunnel The tunnel being closed.
      */
-    public TunnelCloseEvent(final Credentials credentials,
-            final GuacamoleTunnel tunnel) {
-
+    public TunnelCloseEvent(Credentials credentials, GuacamoleTunnel tunnel) {
         this.credentials = credentials;
         this.tunnel = tunnel;
     }
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java
index 7565ca808..b1608111e 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/event/TunnelConnectEvent.java
@@ -32,9 +32,7 @@ public class TunnelConnectEvent implements CredentialEvent, TunnelEvent {
      *                    connecting the tunnel.
      * @param tunnel The tunnel being connected.
      */
-    public TunnelConnectEvent(final Credentials credentials,
-            final GuacamoleTunnel tunnel) {
-
+    public TunnelConnectEvent(Credentials credentials, GuacamoleTunnel tunnel) {
         this.credentials = credentials;
         this.tunnel = tunnel;
     }