diff --git a/tiramisu/setting.py b/tiramisu/setting.py
index e6bc645..d99a02e 100644
--- a/tiramisu/setting.py
+++ b/tiramisu/setting.py
@@ -222,9 +222,8 @@ def get_storage(context, session_id, persistent):
 
     if session_id is None:
         session_id = gen_id(context)
-    a=__import__(storage_type.get_storage(), globals(), locals(),
+    return __import__(storage_type.get_storage(), globals(), locals(),
                       ['Storage'], -1).Storage(session_id, persistent)
-    return a
 
 
 def list_sessions():
@@ -496,7 +495,7 @@ class Settings(object):
                                              "'{1}'").format(path, reqpath))
                 try:
                     value = self.context()._getattr(reqpath,
-                                                  force_permissive=True)
+                                                    force_permissive=True)
                 except PropertiesOptionError, err:
                     if not transitive:
                         continue