diff --git a/__init__.py b/__init__.py
index 19fba5e..fa65ff4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-#This file is part country_zip_es module for Tryton.
-#The COPYRIGHT file at the top level of this repository contains
-#the full copyright notices and license terms.
+# This file is part country_zip_es module for 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 .country_zip import *
-from .address import *
+from . import country_zip
+from . import address
 
 
 def register():
     Pool.register(
-        Address,
-        LoadCountryZipsStart,
+        address.Address,
+        country_zip.LoadCountryZipsStart,
         module='country_zip_es', type_='model')
     Pool.register(
-        LoadCountryZips,
+        country_zip.LoadCountryZips,
         module='country_zip_es', type_='wizard')
diff --git a/country_zip.py b/country_zip.py
index eb910b4..631d2c4 100644
--- a/country_zip.py
+++ b/country_zip.py
@@ -1,6 +1,6 @@
-#This file is part of country_zip_es module for Tryton.
-#The COPYRIGHT file at the top level of this repository contains
-#the full copyright notices and license terms.
+# This file is part of country_zip_es module for Tryton.
+# The COPYRIGHT file at the top level of this repository contains
+# the full copyright notices and license terms.
 from csv import reader
 from trytond.model import ModelView
 from trytond.pool import Pool