diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc
index 4a540f2..e215195 100644
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -949,8 +949,7 @@
   const vector<t_field*>& fields = tstruct->get_sorted_members();
   vector<t_field*>::const_iterator f_iter;
 
-  indent(out) <<
-    "def write(self, oprot):" << endl;
+  indent(out) << "def write(self, oprot):" << endl;
   indent_up();
 
   indent(out) <<
@@ -1062,7 +1061,7 @@
 
   f_service_ << endl;
 
-  // Generate the three main parts of the service (well, two for now in PHP)
+  // Generate the three main parts of the service
   generate_service_interface(tservice);
   generate_service_client(tservice);
   generate_service_server(tservice);
@@ -2180,7 +2179,7 @@
         out << "readDouble();";
         break;
       default:
-        throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
+        throw "compiler error: no Python name for base type " + t_base_type::t_base_name(tbase);
       }
     } else if (type->is_enum()) {
       out << "readI32();";
@@ -2378,7 +2377,7 @@
         out << "writeDouble(" << name << ")";
         break;
       default:
-        throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
+        throw "compiler error: no Python name for base type " + t_base_type::t_base_name(tbase);
       }
     } else if (type->is_enum()) {
       out << "writeI32(" << name << ")";
@@ -2402,8 +2401,7 @@
                                                t_struct* tstruct,
                                                string prefix) {
   (void) tstruct;
-  indent(out) <<
-    prefix << ".write(oprot)" << endl;
+  indent(out) << prefix << ".write(oprot)" << endl;
 }
 
 void t_py_generator::generate_serialize_container(ofstream &out,