diff --git a/account_statement_regex_account_completion/__openerp__.py b/account_statement_regex_account_completion/__openerp__.py
index ab2ea0a3..6567b826 100644
--- a/account_statement_regex_account_completion/__openerp__.py
+++ b/account_statement_regex_account_completion/__openerp__.py
@@ -40,8 +40,8 @@
 Account Statement Regex Account Completion addon
 =========================
 
-- Add a completion method based on a specified regular expression
-    and update account to use in the bank statement line with the specified account.
+Add a completion method based on a specified regular expression and update
+account to use in the bank statement line with the specified account.
 """,
     "data": ['statement_view.xml',
              ],
@@ -53,4 +53,3 @@ Account Statement Regex Account Completion addon
     "auto_install": False,
     "application": False,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_statement_regex_account_completion/statement.py b/account_statement_regex_account_completion/statement.py
index 57e200c6..6a232b02 100644
--- a/account_statement_regex_account_completion/statement.py
+++ b/account_statement_regex_account_completion/statement.py
@@ -44,12 +44,14 @@ class AccountStatementCompletionRule(Model):
         res = super(AccountStatementCompletionRule, self)._get_functions(
             cr, uid, context=context)
         res.append(('set_account',
-                    'Set account for line labels matching a regular expression'))
+                    'Set account for line labels matching a regular '
+                    'expression'))
         return res
 
     _columns = {
         'regex': fields.char('Regular Expression', size=128),
-        'account_id': fields.many2one('account.account', string="Account to set"),
+        'account_id': fields.many2one('account.account',
+                                      string="Account to set"),
     }
 
     def set_account(self, cr, uid, id, st_line, context=None):
diff --git a/account_statement_regex_account_completion/tests/test_regex_account_completion.py b/account_statement_regex_account_completion/tests/test_regex_account_completion.py
index a6cd4eb1..ea3af52c 100644
--- a/account_statement_regex_account_completion/tests/test_regex_account_completion.py
+++ b/account_statement_regex_account_completion/tests/test_regex_account_completion.py
@@ -36,9 +36,9 @@ ACC_NUMBER = "BE38733040385372"
 class test_regex_account_completion(common.TransactionCase):
 
     def prepare(self):
-        self.account_bank_statement_obj = self.registry(
+        self.st_obj = self.registry(
             "account.bank.statement")
-        self.account_bank_statement_line_obj = self.registry(
+        self.st_line_obj = self.registry(
             "account.bank.statement.line")
         self.account_id = self.ref('account.a_expense')
         # create the completion rule
@@ -46,27 +46,28 @@ class test_regex_account_completion(common.TransactionCase):
                      'regex': '^My statement',
                      'account_id': self.account_id}
         completion_rule_id = self.registry(
-            "account.statement.completion.rule").create(self.cr, self.uid, rule_vals)
-
+            "account.statement.completion.rule").create(
+            self.cr, self.uid, rule_vals)
         # Create the profile
         journal_id = self.ref("account.bank_journal")
-        profile_id = self.registry("account.statement.profile").create(self.cr, self.uid, {
-            "name": "TEST",
-            "commission_account_id": self.ref("account.a_recv"),
-            "journal_id": journal_id,
-            "rule_ids": [(6, 0, [completion_rule_id])]})
-
+        profile_id = self.registry("account.statement.profile").create(
+            self.cr, self.uid, {
+                "name": "TEST",
+                "commission_account_id": self.ref("account.a_recv"),
+                "journal_id": journal_id,
+                "rule_ids": [(6, 0, [completion_rule_id])]
+            })
         # Create a bank statement
-        self.statement_id = self.account_bank_statement_obj.create(self.cr, self.uid, {
-            "balance_end_real": 0.0,
-            "balance_start": 0.0,
-            "date": time.strftime('%Y-%m-%d'),
-            "journal_id": journal_id,
-            "profile_id": profile_id
-        })
-
+        self.statement_id = self.st_obj.create(
+            self.cr, self.uid, {
+                "balance_end_real": 0.0,
+                "balance_start": 0.0,
+                "date": time.strftime('%Y-%m-%d'),
+                "journal_id": journal_id,
+                "profile_id": profile_id
+            })
         # Create two bank statement lines
-        self.statement_line1_id = self.account_bank_statement_line_obj.create(self.cr, self.uid, {
+        self.statement_line1_id = self.st_line_obj.create(self.cr, self.uid, {
             'amount': 1000.0,
             'name': 'My statement',
             'ref': 'My ref',
@@ -74,7 +75,7 @@ class test_regex_account_completion(common.TransactionCase):
             'partner_acc_number': ACC_NUMBER
         })
 
-        self.statement_line2_id = self.account_bank_statement_line_obj.create(self.cr, self.uid, {
+        self.statement_line2_id = self.st_line_obj.create(self.cr, self.uid, {
             'amount': 2000.0,
             'name': 'My second statement',
             'ref': 'My second ref',
@@ -86,14 +87,14 @@ class test_regex_account_completion(common.TransactionCase):
         """Test the automatic completion on account
         """
         self.prepare()
-        statement_obj = self.account_bank_statement_obj.browse(
-            self.cr, self.uid, self.statement_id)
+        statement_obj = self.st_obj.browse(self.cr, self.uid, self.statement_id)
         statement_obj.button_auto_completion()
-        statement_line1 = self.account_bank_statement_line_obj.browse(
+        statement_line1 = self.st_line_obj.browse(
             self.cr, self.uid, self.statement_line1_id)
         self.assertEquals(self.account_id, statement_line1.account_id.id,
                           "The account should be the account of the completion")
-        statement_line2 = self.account_bank_statement_line_obj.browse(
+        statement_line2 = self.st_line_obj.browse(
             self.cr, self.uid, self.statement_line2_id)
         self.assertNotEqual(self.account_id, statement_line2.account_id.id,
-                            "The account should be not the account of the completion")
+                            "The account should be not the account of the "
+                            "completion")