diff --git a/src/main/java/org/scribe/builder/api/DefaultApi20.java b/src/main/java/org/scribe/builder/api/DefaultApi20.java
index cc09db3..7e3eb9b 100644
--- a/src/main/java/org/scribe/builder/api/DefaultApi20.java
+++ b/src/main/java/org/scribe/builder/api/DefaultApi20.java
@@ -1,11 +1,8 @@
 package org.scribe.builder.api;
 
-import org.scribe.extractors.AccessTokenExtractor;
-import org.scribe.extractors.TokenExtractor20Impl;
-import org.scribe.model.OAuthConfig;
-import org.scribe.model.Verb;
-import org.scribe.oauth.OAuth20ServiceImpl;
-import org.scribe.oauth.OAuthService;
+import org.scribe.extractors.*;
+import org.scribe.model.*;
+import org.scribe.oauth.*;
 
 /**
  * Default implementation of the OAuth protocol, version 2.0 (draft 11)
diff --git a/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java
index 86407de..94b0cbe 100644
--- a/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java
+++ b/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java
@@ -1,12 +1,7 @@
 package org.scribe.oauth;
 
-import org.scribe.builder.api.DefaultApi20;
-import org.scribe.model.OAuthConfig;
-import org.scribe.model.OAuthConstants;
-import org.scribe.model.OAuthRequest;
-import org.scribe.model.Response;
-import org.scribe.model.Token;
-import org.scribe.model.Verifier;
+import org.scribe.builder.api.*;
+import org.scribe.model.*;
 
 public class OAuth20ServiceImpl implements OAuthService
 {
diff --git a/src/test/java/org/scribe/extractors/TokenExtractor20Test.java b/src/test/java/org/scribe/extractors/TokenExtractor20Test.java
index 167b2d7..17f1a01 100644
--- a/src/test/java/org/scribe/extractors/TokenExtractor20Test.java
+++ b/src/test/java/org/scribe/extractors/TokenExtractor20Test.java
@@ -1,11 +1,10 @@
 package org.scribe.extractors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.scribe.exceptions.OAuthException;
-import org.scribe.model.Token;
+import org.junit.*;
+import org.scribe.exceptions.*;
+import org.scribe.model.*;
 
 public class TokenExtractor20Test
 {