diff --git a/__init__.py b/__init__.py
index 2760752ceb..ca8ad42a71 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.pool import Pool
 from .order_point import *
diff --git a/order_point.py b/order_point.py
index da0293397e..a2520042ee 100644
--- a/order_point.py
+++ b/order_point.py
@@ -1,7 +1,7 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import If, Equal, Eval, Not, In, Get
+from trytond.pyson import If, Equal, Eval, Not, In
 from trytond.transaction import Transaction
 from trytond import backend
 
diff --git a/product.py b/product.py
index f259f0bc13..175a0009f9 100644
--- a/product.py
+++ b/product.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from trytond.model import fields
 from trytond.pool import PoolMeta
 
diff --git a/purchase_request.py b/purchase_request.py
index 2da0fb09ca..3ecdb7b661 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import datetime
 import operator
 from itertools import groupby
@@ -8,7 +8,7 @@ from decimal import Decimal
 from trytond.model import ModelView, ModelSQL, fields
 from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
     Button
-from trytond.pyson import If, In, Eval, Get
+from trytond.pyson import If, In, Eval
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond.tools import grouped_slice
@@ -193,7 +193,7 @@ class PurchaseRequest(ModelSQL, ModelView):
                     ('purchasable', '=', True),
                     ], order=[('id', 'ASC')])
         product_ids = [p.id for p in products]
-        #aggregate product by minimum supply date
+        # aggregate product by minimum supply date
         date2products = {}
         for product in products:
             min_date, max_date = cls.get_supply_dates(product)
diff --git a/setup.py b/setup.py
index 410810c053..8afaf241a5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from setuptools import setup
 import re
diff --git a/shipment.py b/shipment.py
index 4041425503..f8b6c1bdf2 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from sql import Table
 from sql.functions import Overlay, Position
 
diff --git a/tests/__init__.py b/tests/__init__.py
index 25b15ed28b..0ff96a562a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from .test_stock_supply import suite
 
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index c246a44086..70c042d59b 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import unittest
 import doctest
 import datetime