diff --git a/gajim/gtk/roster_item_exchange.py b/gajim/gtk/roster_item_exchange.py
index 892856193a6d7ca09fc7391d72c59d08212b7300..8bfc851ca5e9647c895477f6414a087089363b9e 100644
--- a/gajim/gtk/roster_item_exchange.py
+++ b/gajim/gtk/roster_item_exchange.py
@@ -184,14 +184,14 @@ def _delete(self):
 
         self._ui.accept_button.set_label(_('Delete'))
 
-    def _on_accept_button_clicked(self, widget):
+    def _on_accept_button_clicked(self, _widget):
         model = self._ui.items_list_treeview.get_model()
         iter_ = model.get_iter_first()
         if self.action == 'add':
-            a = 0
+            count = 0
             while iter_:
                 if model[iter_][0]:
-                    a += 1
+                    count += 1
                     # It is selected
                     message = _('%s suggested me to add you to my '
                                 'contact list.' % self.jid_from)
@@ -209,20 +209,21 @@ def _on_accept_button_clicked(self, widget):
                         nickname=model[iter_][2], auto_auth=True)
                 iter_ = model.iter_next(iter_)
             InformationDialog(i18n.ngettext('Added %d contact',
-                                            'Added %d contacts', a, a, a))
+                                            'Added %d contacts',
+                                            count, count, count))
         elif self.action == 'modify':
-            a = 0
+            count = 0
             while iter_:
                 if model[iter_][0]:
-                    a += 1
+                    count += 1
                     # It is selected
                     jid = model[iter_][1]
                     # Keep same groups and same nickname
                     groups = model[iter_][3].split(', ')
                     if groups == ['']:
                         groups = []
-                    for u in app.contacts.get_contact(self.account, jid):
-                        u.name = model[iter_][2]
+                    for contact in app.contacts.get_contact(self.account, jid):
+                        contact.name = model[iter_][2]
                     con = app.connections[self.account]
                     con.get_module('Roster').update_contact(
                         jid, model[iter_][2], groups)
@@ -238,10 +239,10 @@ def _on_accept_button_clicked(self, widget):
                         win.show_title()
                 iter_ = model.iter_next(iter_)
         elif self.action == 'delete':
-            a = 0
+            count = 0
             while iter_:
                 if model[iter_][0]:
-                    a += 1
+                    count += 1
                     # It is selected
                     jid = model[iter_][1]
                     app.connections[self.account].get_module(
@@ -250,8 +251,9 @@ def _on_accept_button_clicked(self, widget):
                     app.contacts.remove_jid(self.account, jid)
                 iter_ = model.iter_next(iter_)
             InformationDialog(i18n.ngettext('Removed %d contact',
-                                            'Removed %d contacts', a, a, a))
+                                            'Removed %d contacts',
+                                            count, count, count))
         self.destroy()
 
-    def _on_cancel_button_clicked(self, widget):
+    def _on_cancel_button_clicked(self, _widget):
         self.destroy()