diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java
index 3a1efd3..81dc986 100644
--- a/src/main/java/org/scribe/builder/api/FlickrApi.java
+++ b/src/main/java/org/scribe/builder/api/FlickrApi.java
@@ -1,7 +1,6 @@
 package org.scribe.builder.api;
 
-
-import org.scribe.model.Token;
+import org.scribe.model.*;
 
 /**
  * OAuth API for Flickr.
@@ -12,36 +11,31 @@ import org.scribe.model.Token;
 public class FlickrApi extends DefaultApi10a
 {
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getAccessTokenEndpoint()
-    {
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public String getAccessTokenEndpoint()
+  {
+    return "http://www.flickr.com/services/oauth/access_token";
+  }
 
-        return "http://www.flickr.com/services/oauth/access_token";
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getAuthorizationUrl(Token requestToken)
-    {
-
-        return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getRequestTokenEndpoint()
-    {
-
-        return "http://www.flickr.com/services/oauth/request_token";
-    }
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public String getAuthorizationUrl(Token requestToken)
+  {
+    return "http://www.flickr.com/services/oauth/authorize?oauth_token="
+        + requestToken.getToken();
+  }
 
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public String getRequestTokenEndpoint()
+  {
+    return "http://www.flickr.com/services/oauth/request_token";
+  }
 }
diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java
index cf58147..946c85c 100644
--- a/src/test/java/org/scribe/examples/FlickrExample.java
+++ b/src/test/java/org/scribe/examples/FlickrExample.java
@@ -1,65 +1,62 @@
 package org.scribe.examples;
 
+import org.scribe.builder.*;
+import org.scribe.builder.api.*;
+import org.scribe.model.*;
+import org.scribe.oauth.*;
 
-import org.scribe.builder.ServiceBuilder;
-import org.scribe.builder.api.FlickrApi;
-import org.scribe.model.OAuthRequest;
-import org.scribe.model.Response;
-import org.scribe.model.Token;
-import org.scribe.model.Verb;
-import org.scribe.model.Verifier;
-import org.scribe.oauth.OAuthService;
-
-import java.util.Scanner;
+import java.util.*;
 
 public class FlickrExample
 {
-    private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/";
+  private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/";
 
-    public static void main(String[] args)
-    {
+  public static void main(String[] args)
+  {
+    // Replace these with your own api key and secret
+    String apiKey = "your_app_id";
+    String apiSecret = "your_api_secret";
+    OAuthService service = new ServiceBuilder().provider(FlickrApi.class)
+        .apiKey(apiKey).apiSecret(apiSecret).build();
+    Scanner in = new Scanner(System.in);
 
-        // Replace these with your own api key and secret
-        String apiKey = "your_app_id";
-        String apiSecret = "your_api_secret";
-        OAuthService service = new ServiceBuilder().provider(FlickrApi.class).apiKey(apiKey).apiSecret(apiSecret).build();
-        Scanner in = new Scanner(System.in);
+    System.out.println("=== Flickr's OAuth Workflow ===");
+    System.out.println();
 
-        System.out.println("=== Flickr's OAuth Workflow ===");
-        System.out.println();
+    // Obtain the Request Token
+    System.out.println("Fetching the Request Token...");
+    Token requestToken = service.getRequestToken();
+    System.out.println("Got the Request Token!");
+    System.out.println();
 
-        // Obtain the Request Token
-        System.out.println("Fetching the Request Token...");
-        Token requestToken = service.getRequestToken();
-        System.out.println("Got the Request Token!");
-        System.out.println();
+    System.out.println("Now go and authorize Scribe here:");
+    String authorizationUrl = service.getAuthorizationUrl(requestToken);
+    System.out.println(authorizationUrl + "&perms=read");
+    System.out.println("And paste the verifier here");
+    System.out.print(">>");
+    Verifier verifier = new Verifier(in.nextLine());
+    System.out.println();
 
-        System.out.println("Now go and authorize Scribe here:");
-        String authorizationUrl = service.getAuthorizationUrl(requestToken);
-        System.out.println(authorizationUrl + "&perms=read");
-        System.out.println("And paste the verifier here");
-        System.out.print(">>");
-        Verifier verifier = new Verifier(in.nextLine());
-        System.out.println();
+    // Trade the Request Token and Verfier for the Access Token
+    System.out.println("Trading the Request Token for an Access Token...");
+    Token accessToken = service.getAccessToken(requestToken, verifier);
+    System.out.println("Got the Access Token!");
+    System.out.println("(if your curious it looks like this: " + accessToken
+        + " )");
+    System.out.println();
 
-        // Trade the Request Token and Verfier for the Access Token
-        System.out.println("Trading the Request Token for an Access Token...");
-        Token accessToken = service.getAccessToken(requestToken, verifier);
-        System.out.println("Got the Access Token!");
-        System.out.println("(if your curious it looks like this: " + accessToken + " )");
-        System.out.println();
+    // Now let's go and ask for a protected resource!
+    System.out.println("Now we're going to access a protected resource...");
+    OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
+    request.addQuerystringParameter("method", "flickr.test.login");
+    service.signRequest(accessToken, request);
+    Response response = request.send();
+    System.out.println("Got it! Lets see what we found...");
+    System.out.println();
+    System.out.println(response.getBody());
 
-        // Now let's go and ask for a protected resource!
-        System.out.println("Now we're going to access a protected resource...");
-        OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
-        request.addQuerystringParameter("method", "flickr.test.login");
-        service.signRequest(accessToken, request);
-        Response response = request.send();
-        System.out.println("Got it! Lets see what we found...");
-        System.out.println();
-        System.out.println(response.getBody());
-
-        System.out.println();
-        System.out.println("Thats it man! Go and build something awesome with Scribe! :)");
-    }
+    System.out.println();
+    System.out
+        .println("Thats it man! Go and build something awesome with Scribe! :)");
+  }
 }