diff --git a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java
index 276397a..d27b2fe 100644
--- a/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java
+++ b/src/main/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManager.java
@@ -7,14 +7,12 @@
 import com.github.brenoepics.at4j.util.rest.RestRequestHandler;
 import com.github.brenoepics.at4j.util.rest.RestRequestResponseInformationImpl;
 import com.github.brenoepics.at4j.util.rest.RestRequestResult;
-
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
-
 import okhttp3.Response;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/test/java/com/github/brenoepics/at4j/AzureApiBuilderTest.java b/src/test/java/com/github/brenoepics/at4j/AzureApiBuilderTest.java
index 4d55ca4..ede4cbc 100644
--- a/src/test/java/com/github/brenoepics/at4j/AzureApiBuilderTest.java
+++ b/src/test/java/com/github/brenoepics/at4j/AzureApiBuilderTest.java
@@ -1,10 +1,10 @@
 package com.github.brenoepics.at4j;
 
-import org.junit.jupiter.api.Test;
-import com.github.brenoepics.at4j.azure.BaseURL;
-
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.github.brenoepics.at4j.azure.BaseURL;
+import org.junit.jupiter.api.Test;
+
 class AzureApiBuilderTest {
 
   @Test
diff --git a/src/test/java/com/github/brenoepics/at4j/azure/lang/LanguageTest.java b/src/test/java/com/github/brenoepics/at4j/azure/lang/LanguageTest.java
index a1401ae..e91fe8c 100644
--- a/src/test/java/com/github/brenoepics/at4j/azure/lang/LanguageTest.java
+++ b/src/test/java/com/github/brenoepics/at4j/azure/lang/LanguageTest.java
@@ -1,12 +1,12 @@
 package com.github.brenoepics.at4j.azure.lang;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class LanguageTest {
 
   private Language language;
diff --git a/src/test/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java b/src/test/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java
index 3837ca6..296f1e1 100644
--- a/src/test/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java
+++ b/src/test/java/com/github/brenoepics/at4j/core/ratelimit/RateLimitManagerTest.java
@@ -1,25 +1,23 @@
 package com.github.brenoepics.at4j.core.ratelimit;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import com.github.brenoepics.at4j.core.AzureApiImpl;
 import com.github.brenoepics.at4j.core.exceptions.AzureException;
 import com.github.brenoepics.at4j.core.thread.ThreadPool;
 import com.github.brenoepics.at4j.util.rest.RestRequest;
 import com.github.brenoepics.at4j.util.rest.RestRequestResult;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 import okhttp3.Response;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.IOException;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-
-import static org.mockito.Mockito.*;
-
 class RateLimitManagerTest<T> {
 
   @Mock private AzureApiImpl<T> api;
diff --git a/src/test/java/com/github/brenoepics/at4j/core/thread/AT4JThreadFactoryTest.java b/src/test/java/com/github/brenoepics/at4j/core/thread/AT4JThreadFactoryTest.java
index 9eb41ae..4a693eb 100644
--- a/src/test/java/com/github/brenoepics/at4j/core/thread/AT4JThreadFactoryTest.java
+++ b/src/test/java/com/github/brenoepics/at4j/core/thread/AT4JThreadFactoryTest.java
@@ -1,9 +1,9 @@
 package com.github.brenoepics.at4j.core.thread;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Test;
+
 class AT4JThreadFactoryTest {
 
   @Test
diff --git a/src/test/java/com/github/brenoepics/at4j/core/thread/ThreadPoolImplTest.java b/src/test/java/com/github/brenoepics/at4j/core/thread/ThreadPoolImplTest.java
index 645d123..6ab2777 100644
--- a/src/test/java/com/github/brenoepics/at4j/core/thread/ThreadPoolImplTest.java
+++ b/src/test/java/com/github/brenoepics/at4j/core/thread/ThreadPoolImplTest.java
@@ -1,13 +1,12 @@
 package com.github.brenoepics.at4j.core.thread;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class ThreadPoolImplTest {