diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index f4ba9231f5..bd5a588c27 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -873,7 +873,7 @@ class CodeResponse(LoncapaResponse):
                                                 queue_name=self.queue_name)
 
         # Generate body
-        #   NOTE: Currently specialized to 6.00x's pyxservers, which follows the ExternalResponse interface
+        #   NOTE: Currently specialized to 6.00x's pyxserver, which follows the ExternalResponse interface
         contents = {'xml': etree.tostring(self.xml, pretty_print=True),
                     'edX_cmd': 'get_score',
                     'edX_tests': self.tests,
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index c9d26a5ec2..a06f512a6d 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -47,11 +47,11 @@ class @Problem
       $(placeholder).remove()
 
   ###
-  # 'check_fd' uses FormData to allow file submissions, in addition to simple, 
-  #      querystring-based answers, in the 'problem_check' dispatch.
+  # 'check_fd' uses FormData to allow file submissions in the 'problem_check' dispatch,
+  #      in addition to simple querystring-based answers
   #
   # NOTE: The dispatch 'problem_check' is being singled out for the use of FormData;
-  #       perhaps preferable to consolidate all dispatches to use FormData consistently
+  #       maybe preferable to consolidate all dispatches to use FormData
   ###
   check_fd: =>
     Logger.log 'problem_check', @answers
@@ -63,15 +63,14 @@ class @Problem
     fd = new FormData()
 
     # For each file input, allow a single file submission,
-    #   routed to Django 'request.FILES'
+    #   which is routed to Django 'request.FILES'
     @$('input:file').each (index, element) ->
       if element.files[0] instanceof File
         fd.append(element.id, element.files[0])
       else
         fd.append(element.id, '')  # Even if no file selected, need to include input id
 
-    # Simple (non-file) answers,
-    #   routed to Django 'request.POST'
+    # Simple (non-file) answers, which is routed to Django 'request.POST'
     fd.append('__answers_querystring', @answers)
 
     settings = 
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index b0bb760753..0eaaa60196 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -276,7 +276,7 @@ def modx_dispatch(request, dispatch=None, id=None):
     post = request.POST.copy() 
 
     # Catch the use of FormData in xmodule frontend for 'problem_check'. After this block,
-    #   the 'post' dict is functionally equivalent before- and after- the use of FormData
+    #   the 'post' dict is functionally equivalent before and after the use of FormData
     # TODO: A more elegant solution?
     if post.has_key('__answers_querystring'):
         qs = post.pop('__answers_querystring')[0]