diff --git a/portas/portas/api/v1/__init__.py b/portas/portas/api/v1/__init__.py
index 2c08d56..062b734 100644
--- a/portas/portas/api/v1/__init__.py
+++ b/portas/portas/api/v1/__init__.py
@@ -28,10 +28,10 @@ def get_env_status(environment_id, session_id):
 
     if not session_id:
         variants = ['open', 'deploying']
-        session = unit.query(Session).filter(Session.environment_id ==
-                                             environment_id and
-                                             Session.state.in_(variants)
-                                             ).first()
+        session = unit.query(Session).filter(
+            Session.environment_id == environment_id and
+            Session.state.in_(variants)
+        ).first()
         if session:
             session_id = session.id
         else:
@@ -79,10 +79,10 @@ def get_service_status(environment_id, session_id, service):
 
     entities = [u['id'] for u in service['units']]
     reports_count = unit.query(Status).filter(
-                    Status.environment_id == environment_id
-                    and Status.session_id == session_id
-                    and Status.entity_id.in_(entities)
-                    ).count()
+        Status.environment_id == environment_id
+        and Status.session_id == session_id
+        and Status.entity_id.in_(entities)
+    ).count()
 
     if session_state == 'deployed':
         status = 'finished'
diff --git a/portas/portas/api/v1/sessions.py b/portas/portas/api/v1/sessions.py
index 7166da3..90b58b8 100644
--- a/portas/portas/api/v1/sessions.py
+++ b/portas/portas/api/v1/sessions.py
@@ -37,9 +37,9 @@ class Controller(object):
         session.update(params)
 
         unit = get_session()
-        if unit.query(Session).filter(Session.environment_id == environment_id
-        and
-                Session.state.in_(['open', 'deploing'])
+        if unit.query(Session).filter(
+                Session.environment_id == environment_id and
+                Session.state.in_(['open', 'deploying'])
         ).first():
             log.info('There is already open session for this environment')
             raise exc.HTTPConflict
@@ -54,8 +54,8 @@ class Controller(object):
         return session.to_dict()
 
     def show(self, request, environment_id, session_id):
-        log.debug(_('Session:Show <EnvId: {0}, SessionId: {1}>'.
-        format(environment_id, session_id)))
+        log.debug(_('Session:Show <EnvId: {0}, '
+                    'SessionId: {1}>'.format(environment_id, session_id)))
 
         unit = get_session()
         session = unit.query(Session).get(session_id)
@@ -67,8 +67,8 @@ class Controller(object):
         return session.to_dict()
 
     def delete(self, request, environment_id, session_id):
-        log.debug(_('Session:Delete <EnvId: {0}, SessionId: {1}>'.
-        format(environment_id, session_id)))
+        log.debug(_('Session:Delete <EnvId: {0}, '
+                    'SessionId: {1}>'.format(environment_id, session_id)))
 
         unit = get_session()
         session = unit.query(Session).get(session_id)
@@ -84,8 +84,8 @@ class Controller(object):
         return None
 
     def reports(self, request, environment_id, session_id):
-        log.debug(_('Session:Reports <EnvId: {0}, SessionId: {1}>'.
-        format(environment_id, session_id)))
+        log.debug(_('Session:Reports <EnvId: {0}, '
+                    'SessionId: {1}>'.format(environment_id, session_id)))
 
         unit = get_session()
         statuses = unit.query(Status).filter_by(session_id=session_id).all()
@@ -96,12 +96,12 @@ class Controller(object):
 
             environment = unit.query(Session).get(session_id).description
             services = []
-            if 'services' in environment and \
-                            'activeDirectories' in environment['services']:
+            if 'services' in environment and 'activeDirectories' in\
+                    environment['services']:
                 services += environment['services']['activeDirectories']
 
-            if 'services' in environment and \
-                            'webServers' in environment['services']:
+            if 'services' in environment and 'webServers' in\
+                    environment['services']:
                 services += environment['services']['webServers']
 
             service = [service for service in services
@@ -118,8 +118,8 @@ class Controller(object):
         return {'reports': [status.to_dict() for status in result]}
 
     def deploy(self, request, environment_id, session_id):
-        log.debug(_('Session:Deploy <EnvId: {0}, SessionId: {1}>'.
-        format(environment_id, session_id)))
+        log.debug(_('Session:Deploy <EnvId: {0}, '
+                    'SessionId: {1}>'.format(environment_id, session_id)))
 
         unit = get_session()
         session = unit.query(Session).get(session_id)