diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py
index 7d565ad23..e7f06481d 100644
--- a/r2/r2/controllers/promotecontroller.py
+++ b/r2/r2/controllers/promotecontroller.py
@@ -19,29 +19,63 @@
 # All portions of the code written by reddit are Copyright (c) 2006-2012 reddit
 # Inc. All Rights Reserved.
 ###############################################################################
+from datetime import datetime, timedelta
 
 import json
 
+from pylons import c, g, request
 from pylons.i18n import _
-from r2.models import *
+
+from r2.controllers.listingcontroller import ListingController
+from r2.lib import cssfilter, promote
 from r2.lib.authorize import get_account_info, edit_profile, PROFILE_LIMIT
-from r2.lib.pages import *
+from r2.lib.db import queries
+from r2.lib.errors import errors
+from r2.lib.media import force_thumbnail, thumbnail_url
+from r2.lib.pages import (
+    LinkInfoPage,
+    PaymentForm,
+    PromoAdminTool,
+    Promote_Graph,
+    PromotePage,
+    PromoteLinkForm,
+    PromoteLinkFormCpm,
+    Roadblocks,
+    UploadedImage,
+)
 from r2.lib.pages.trafficpages import TrafficViewerList
 from r2.lib.pages.things import wrap_links
-from r2.lib.strings import strings
-from r2.lib.menus import *
-from r2.controllers.listingcontroller import ListingController
-from r2.lib.db import queries
-
-from r2.controllers.reddit_base import RedditController
-
-from r2.lib.utils import make_offset_date
-from r2.lib.media import force_thumbnail, thumbnail_url
-from r2.lib.scraper import MediaEmbed
-from r2.lib import cssfilter
 from r2.lib.system_messages import user_added_messages
-from r2.lib.validator import *
-from datetime import datetime
+from r2.lib.utils import make_offset_date
+from r2.lib.validator import (
+    nop,
+    noresponse,
+    ValidAddress,
+    validate,
+    validatedForm,
+    ValidCard,
+    ValidIP,
+    VBoolean,
+    VByName,
+    VDate,
+    VDateRange,
+    VExistingUname,
+    VFloat,
+    VInt,
+    VLength,
+    VLink,
+    VModhash,
+    VOneOf,
+    VPromoCampaign,
+    VRatelimit,
+    VSponsor,
+    VSponsorAdmin,
+    VSubmitSR,
+    VTitle,
+    VUrl,
+)
+from r2.models import Link, Message, NotFound, PromoCampaign, PromotionLog
+
 
 class PromoteController(ListingController):
     where = 'promoted'