diff --git a/common/djangoapps/track/views.py b/common/djangoapps/track/views.py
index 31878bee26..b5f9c54665 100644
--- a/common/djangoapps/track/views.py
+++ b/common/djangoapps/track/views.py
@@ -23,7 +23,7 @@ def log_event(event):
     log.info(event_str[:settings.TRACK_MAX_EVENT])
     if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
         event['time'] = dateutil.parser.parse(event['time'])
-        tldat = TrackingLog(**dict([(x,event[x]) for x in LOGFIELDS]))
+        tldat = TrackingLog(**dict( (x,event[x]) for x in LOGFIELDS ))
         try:
             tldat.save()
         except Exception as err:
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index cdb9dc40f3..b6ba381a26 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -190,9 +190,9 @@ def get_module(user, request, location, student_module_cache, position=None):
         module.metadata['data_dir']
     )
 
-    if (settings.MITX_FEATURES.get('DISPLAY_HISTOGRAMS_TO_STAFF') and
-        (user.is_staff or has_staff_access_to_course(user, module.location.course))):
-        module.get_html = add_histogram(module.get_html, module)
+    if settings.MITX_FEATURES.get('DISPLAY_HISTOGRAMS_TO_STAFF'):
+        if has_staff_access_to_course(user, module.location.course):
+            module.get_html = add_histogram(module.get_html, module)
 
     # If StudentModule for this instance wasn't already in the database,
     # and this isn't a guest user, create it.