diff --git a/addons/hw_scale/__openerp__.py b/addons/hw_scale/__openerp__.py
index 6a05128a5ed..9bba6d94c5a 100644
--- a/addons/hw_scale/__openerp__.py
+++ b/addons/hw_scale/__openerp__.py
@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-
 {
     'name': 'Weighing Scale Hardware Driver',
-    'version': '1.0',
     'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Weighing Scales',
@@ -19,8 +17,4 @@ such as the Mettler Toledo Ariva.
 """,
     'depends': ['hw_proxy'],
     'external_dependencies': {'python': ['serial']},
-    'test': [
-    ],
-    'installable': True,
-    'auto_install': False,
 }
diff --git a/addons/hw_scale/controllers/__init__.py b/addons/hw_scale/controllers/__init__.py
index 8ee9bae18d9..f48716d3a69 100644
--- a/addons/hw_scale/controllers/__init__.py
+++ b/addons/hw_scale/controllers/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import main
diff --git a/addons/hw_scale/controllers/main.py b/addons/hw_scale/controllers/main.py
index 2437b7829ea..2befca2af24 100644
--- a/addons/hw_scale/controllers/main.py
+++ b/addons/hw_scale/controllers/main.py
@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import logging
 import os
 import time
 from os import listdir
-from os.path import join
 from threading import Thread, Lock
-from select import select
-from Queue import Queue, Empty
 
-import openerp
-import openerp.addons.hw_proxy.controllers.main as hw_proxy
-from openerp import http
-from openerp.http import request
-from openerp.tools.translate import _
+from odoo import http
+
+import odoo.addons.hw_proxy.controllers.main as hw_proxy
 
 _logger = logging.getLogger(__name__)
 
@@ -224,9 +221,7 @@ if serial:
 class ScaleDriver(hw_proxy.Proxy):
     @http.route('/hw_proxy/scale_read/', type='json', auth='none', cors='*')
     def scale_read(self):
-        if scale_thread:
-            return {'weight': scale_thread.get_weight(), 'unit':'kg', 'info': scale_thread.get_weight_info()}
-        return None
+        return {'weight': scale_thread.get_weight(), 'unit':'kg', 'info': scale_thread.get_weight_info()} if scale_thread else None
 
     @http.route('/hw_proxy/scale_zero/', type='json', auth='none', cors='*')
     def scale_zero(self):
@@ -245,5 +240,3 @@ class ScaleDriver(hw_proxy.Proxy):
         if scale_thread:
             scale_thread.clear_tare()
         return True
-        
-