diff --git a/run_tests.py b/run_tests.py
index aab02c1..caabda4 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -52,8 +52,8 @@ if __name__ == '__main__':
     coverage.analysis(jcl.lang)
     coverage.analysis(jcl.model.account)
 
-    coverage.report([jcl.jabber.component, \
-                     jcl.jabber.feeder, \
-                     jcl.lang, \
+    coverage.report([jcl.jabber.component,
+                     jcl.jabber.feeder,
+                     jcl.lang,
                      jcl.model.account])
 
diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py
index 1cdae52..fcbe8bb 100644
--- a/src/jcl/jabber/component.py
+++ b/src/jcl/jabber/component.py
@@ -255,7 +255,7 @@ class JCLComponent(Component, object):
             self.send_stanzas(result)
         return result
 
-    def apply_registered_behavior(self, handlers, stanza, apply_all = False):
+    def apply_registered_behavior(self, handlers, stanza, apply_all=False):
         """Execute handler if their filter method does not return None"""
         result = []
         self.db_connect()
@@ -280,15 +280,17 @@ class JCLComponent(Component, object):
     def disco_get_info(self, node, info_query):
         """Discovery get info handler
         """
-        return self.apply_behavior(info_query, \
-                                   lambda name, from_jid, account_type, lang_class: \
-                                   self.account_manager.account_disco_get_info(), \
-                                   lambda name, from_jid, account_type, lang_class: \
-                                   self.account_manager.account_type_disco_get_info(), \
-                                   lambda name, from_jid, account_type, lang_class: \
-                                   self.account_manager.root_disco_get_info(self.name, \
-                                                                            self.disco_identity.category, \
-                                                                            self.disco_identity.type))
+        return self.apply_behavior(\
+            info_query,
+            lambda name, from_jid, account_type, lang_class: \
+                self.account_manager.account_disco_get_info(),
+            lambda name, from_jid, account_type, lang_class: \
+                self.account_manager.account_type_disco_get_info(),
+            lambda name, from_jid, account_type, lang_class: \
+                self.account_manager.root_disco_get_info(
+                self.name,
+                self.disco_identity.category,
+                self.disco_identity.type))
 
     def disco_get_items(self, node, info_query):
         """Discovery get nested nodes handler
@@ -338,7 +340,7 @@ class JCLComponent(Component, object):
         """
         self.__logger.debug("SET_REGISTER")
         lang_class = \
-                   self.lang.get_lang_class_from_node(info_query.get_node())
+            self.lang.get_lang_class_from_node(info_query.get_node())
         from_jid = info_query.get_from()
         base_from_jid = unicode(from_jid.bare())
         remove = info_query.xpath_eval("r:query/r:remove", \
@@ -1207,6 +1209,6 @@ class PasswordMessageHandler(Handler):
         _account.waiting_password_reply = False
         return [Message(from_jid = _account.jid, \
                             to_jid = stanza.get_from(), \
-                            subject = lang_class.password_saved_for_session, \
-                            body = lang_class.password_saved_for_session)]
+                            subject = lang.password_saved_for_session, \
+                            body = lang.password_saved_for_session)]
         
diff --git a/src/jcl/jabber/tests/component.py b/src/jcl/jabber/tests/component.py
index a7388ac..ed37294 100644
--- a/src/jcl/jabber/tests/component.py
+++ b/src/jcl/jabber/tests/component.py
@@ -41,7 +41,9 @@ from pyxmpp.presence import Presence
 from pyxmpp.message import Message
 from pyxmpp.jabber.dataforms import Form, Field, Option
 
-from jcl.jabber.component import JCLComponent, Handler, PasswordMessageHandler, DefaultSubscribeHandler, DefaultUnsubscribeHandler, DefaultPresenceHandler
+from jcl.jabber.component import JCLComponent, Handler, \
+    PasswordMessageHandler, DefaultSubscribeHandler, \
+    DefaultUnsubscribeHandler, DefaultPresenceHandler
 from jcl.model import account
 from jcl.model.account import Account
 from jcl.lang import Lang
@@ -55,12 +57,12 @@ else:
 DB_URL = DB_PATH# + "?debug=1&debugThreading=1"
 
 class MockStream(object):
-    def __init__(self, \
-                 jid = "",
-                 secret = "",
-                 server = "",
-                 port = "",
-                 keepalive = True):
+    def __init__(self,
+                 jid="",
+                 secret="",
+                 server="",
+                 port="",
+                 keepalive=True):
         self.sent = []
         self.connection_started = False
         self.connection_stopped = False
@@ -73,9 +75,9 @@ class MockStream(object):
     def set_iq_set_handler(self, iq_type, ns, handler):
         if not iq_type in ["query"]:
             raise Exception("IQ type unknown: " + iq_type)
-        if not ns in ["jabber:iq:version", \
-                      "jabber:iq:register", \
-                      "http://jabber.org/protocol/disco#items", \
+        if not ns in ["jabber:iq:version",
+                      "jabber:iq:register",
+                      "http://jabber.org/protocol/disco#items",
                       "http://jabber.org/protocol/disco#info"]:
             raise Exception("Unknown namespace: " + ns)
         if handler is None:
@@ -84,12 +86,12 @@ class MockStream(object):
     set_iq_get_handler = set_iq_set_handler
 
     def set_presence_handler(self, status, handler):
-        if not status in ["available", \
-                          "unavailable", \
-                          "probe", \
-                          "subscribe", \
-                          "subscribed", \
-                          "unsubscribe", \
+        if not status in ["available",
+                          "unavailable",
+                          "probe",
+                          "subscribe",
+                          "subscribed",
+                          "unsubscribe",
                           "unsubscribed"]:
             raise Exception("Status unknown: " + status)
         if handler is None: