diff --git a/src/omero/clients.py b/src/omero/clients.py
index 3f53990aa..d29241a94 100755
--- a/src/omero/clients.py
+++ b/src/omero/clients.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-"""
-
-   Copyright 2009 - 2016 Glencoe Software, Inc. All rights reserved.
-   Use is subject to license terms supplied in LICENSE.txt
-
-"""
+#
+#
+#   Copyright 2009 - 2016 Glencoe Software, Inc. All rights reserved.
+#   Use is subject to license terms supplied in LICENSE.txt
+#
+#
 from __future__ import print_function
 
 from builtins import zip
diff --git a/src/omero/gateway/__init__.py b/src/omero/gateway/__init__.py
index 47e186413..27ba48bc5 100644
--- a/src/omero/gateway/__init__.py
+++ b/src/omero/gateway/__init__.py
@@ -181,7 +181,7 @@ def fileread_gen(fin, fsize, bufsize):
 
 def getAnnotationLinkTableName(objecttype):
     """
-    Get the name of the *AnnotationLink table
+    Get the name of the AnnotationLink table
     for the given objecttype
     """
     objecttype = objecttype.lower()
diff --git a/src/omero/rtypes.py b/src/omero/rtypes.py
index 22d7c39cc..85d28b7e1 100644
--- a/src/omero/rtypes.py
+++ b/src/omero/rtypes.py
@@ -1,15 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-"""
-::
-    /*
-     *   $Id$
-     *
-     *   Copyright 2008 Glencoe Software, Inc. All rights reserved.
-     *   Use is subject to license terms supplied in LICENSE.txt
-     *
-     */
-"""
+#
+#
+#    Copyright 2008 Glencoe Software, Inc. All rights reserved.
+#   Use is subject to license terms supplied in LICENSE.txt
+#
 
 """
 Module which is responsible for creating rtypes from static