diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
index 4bbdedb..663faf8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
@@ -14,6 +14,16 @@
 
 package com.googlesource.gerrit.plugins.javamelody;
 
+import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.httpd.AllRequestFilter;
+import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.account.CapabilityControl;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+import net.bull.javamelody.MonitoringFilter;
+
 import java.io.IOException;
 
 import javax.servlet.FilterChain;
@@ -24,16 +34,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.bull.javamelody.MonitoringFilter;
-
-import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.httpd.AllRequestFilter;
-import com.google.gerrit.server.CurrentUser;
-import com.google.gerrit.server.account.CapabilityControl;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
 @Singleton
 class GerritMonitoringFilter extends AllRequestFilter {
   private final JavamelodyFilter monitoring;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
index 3ea3a98..dbe8d3b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
@@ -14,11 +14,11 @@
 
 package com.googlesource.gerrit.plugins.javamelody;
 
-import javax.sql.DataSource;
+import com.google.gerrit.extensions.persistence.DataSourceInterceptor;
 
 import net.bull.javamelody.JdbcWrapper;
 
-import com.google.gerrit.extensions.persistence.DataSourceInterceptor;
+import javax.sql.DataSource;
 
 public class MonitoringDataSourceInterceptor implements DataSourceInterceptor {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
index 59510d7..4faa057 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
@@ -14,9 +14,6 @@
 
 package com.googlesource.gerrit.plugins.javamelody;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.webui.TopMenu;
@@ -25,6 +22,9 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
+import java.util.Collections;
+import java.util.List;
+
 public class MonitoringTopMenu implements TopMenu {
   private final List<MenuEntry> menuEntries;
   private final Provider<CurrentUser> userProvider;