diff --git a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
index 90bc698d5..15ef80e21 100644
--- a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
+++ b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
@@ -386,56 +386,55 @@ class Model
         $project = array_change_key_case($project);
 
         //if (! empty($diagram)) {
-            $lanesets = self::getBpmnCollectionBy('Laneset', LanesetPeer::PRJ_UID, $prjUid, true);
-            $lanes = self::getBpmnCollectionBy('Lane', LanePeer::PRJ_UID, $prjUid, true);
+        $lanesets = self::getBpmnCollectionBy('Laneset', LanesetPeer::PRJ_UID, $prjUid, true);
+        $lanes = self::getBpmnCollectionBy('Lane', LanePeer::PRJ_UID, $prjUid, true);
 
-            //$activities = self::getBpmnCollectionBy('Activity', ActivityPeer::PRJ_UID, $prjUid, true);
-            //$activities = Activity::getAll(null, null, null, 'object', CASE_LOWER);
-            $activities = Activity::getAll(array('changeCaseTo' => CASE_LOWER));
-            //print_r($activities); die;
+        //$activities = self::getBpmnCollectionBy('Activity', ActivityPeer::PRJ_UID, $prjUid, true);
+        //$activities = Activity::getAll(null, null, null, 'object', CASE_LOWER);
+        $activities = Activity::getAll(array('changeCaseTo' => CASE_LOWER));
+        //print_r($activities); die;
 
-            $events = self::getBpmnCollectionBy('Event', EventPeer::PRJ_UID, $prjUid, true);
-            $gateways = self::getBpmnCollectionBy('Gateway', GatewayPeer::PRJ_UID, $prjUid, true);
-            $flows = self::getBpmnCollectionBy('Flow', FlowPeer::PRJ_UID, $prjUid, true);
-            $artifacts = self::getBpmnCollectionBy('Artifact', ArtifactPeer::PRJ_UID, $prjUid, true);
+        $events = self::getBpmnCollectionBy('Event', EventPeer::PRJ_UID, $prjUid, true);
+        $gateways = self::getBpmnCollectionBy('Gateway', GatewayPeer::PRJ_UID, $prjUid, true);
+        $flows = self::getBpmnCollectionBy('Flow', FlowPeer::PRJ_UID, $prjUid, true);
+        $artifacts = self::getBpmnCollectionBy('Artifact', ArtifactPeer::PRJ_UID, $prjUid, true);
 
-            // getting activity bound data
-            foreach ($activities as $i => $activity) {
-                $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $activity['act_uid'], true);
+        // getting activity bound data
+        foreach ($activities as $i => $activity) {
+            $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $activity['act_uid'], true);
 
-                if (is_object($bound)) {
-                    $activities[$i] = array_merge($activities[$i], $bound);
-                }
+            if (is_object($bound)) {
+                $activities[$i] = array_merge($activities[$i], $bound);
             }
+        }
 
-            // getting event bound data
-            foreach ($events as $i => $event) {
-                $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $event['evn_uid'], true);
+        // getting event bound data
+        foreach ($events as $i => $event) {
+            $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $event['evn_uid'], true);
 
-                if (is_object($bound)) {
-                    $events[$i] = array_merge($events[$i], $bound);
-                }
+            if (is_object($bound)) {
+                $events[$i] = array_merge($events[$i], $bound);
             }
+        }
 
-            // getting gateway bound data
-            foreach ($gateways as $i => $gateway) {
-                $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $gateway['gat_uid'], true);
+        // getting gateway bound data
+        foreach ($gateways as $i => $gateway) {
+            $bound = self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $gateway['gat_uid'], true);
 
-                if (is_object($bound)) {
-                    $gateways[$i] = array_merge($gateways[$i], $bound);
-                }
+            if (is_object($bound)) {
+                $gateways[$i] = array_merge($gateways[$i], $bound);
             }
+        }
 
-
-            $project['diagrams'] = array($diagram);
-            $project['diagrams'][0]['pro_uid'] = $process['pro_uid'];
-            $project['diagrams'][0]['laneset'] = $lanesets;
-            $project['diagrams'][0]['lanes'] = $lanes;
-            $project['diagrams'][0]['activities'] = $activities;
-            $project['diagrams'][0]['events'] = $events;
-            $project['diagrams'][0]['gateways'] = $gateways;
-            $project['diagrams'][0]['flows'] = $flows;
-            $project['diagrams'][0]['artifacts'] = $artifacts;
+        $project['diagrams'] = array($diagram);
+        $project['diagrams'][0]['pro_uid'] = $process['pro_uid'];
+        $project['diagrams'][0]['laneset'] = $lanesets;
+        $project['diagrams'][0]['lanes'] = $lanes;
+        $project['diagrams'][0]['activities'] = $activities;
+        $project['diagrams'][0]['events'] = $events;
+        $project['diagrams'][0]['gateways'] = $gateways;
+        $project['diagrams'][0]['flows'] = $flows;
+        $project['diagrams'][0]['artifacts'] = $artifacts;
         //}
 
         return $project;
diff --git a/workflow/engine/src/ProcessMaker/Adapter/Workflow.php b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php
index 0b1a9a7ac..347141c2b 100644
--- a/workflow/engine/src/ProcessMaker/Adapter/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php
@@ -147,7 +147,6 @@ class Workflow
                                 '_action' => 'CREATE'
                             );
                             break;
-
                         default:
                             throw new \LogicException("Invalid connection to Event object type");
                     }
diff --git a/workflow/engine/src/ProcessMaker/Services/Api.php b/workflow/engine/src/ProcessMaker/Services/Api.php
index 29de0d07d..0bca4307f 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api.php
@@ -41,4 +41,5 @@ abstract class Api
     {
         return \Services\Api\OAuth2\Server::getUserId();
     }
-}
\ No newline at end of file
+}
+
diff --git a/workflow/engine/src/ProcessMaker/Util/Logger.php b/workflow/engine/src/ProcessMaker/Util/Logger.php
index fb4115799..f76f8f6e6 100644
--- a/workflow/engine/src/ProcessMaker/Util/Logger.php
+++ b/workflow/engine/src/ProcessMaker/Util/Logger.php
@@ -43,4 +43,5 @@ class Logger
         $me = Logger::getInstance();
         $me->setLog($data);
     }
-}
\ No newline at end of file
+}
+
diff --git a/workflow/engine/src/Services/Api/OAuth2/PmPdo.php b/workflow/engine/src/Services/Api/OAuth2/PmPdo.php
index 27b9d8434..4872825a2 100644
--- a/workflow/engine/src/Services/Api/OAuth2/PmPdo.php
+++ b/workflow/engine/src/Services/Api/OAuth2/PmPdo.php
@@ -245,3 +245,4 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
         return array_merge($a, array_change_key_case($a, $case));
     }
 }
+
diff --git a/workflow/engine/src/Services/Api/OAuth2/Server.php b/workflow/engine/src/Services/Api/OAuth2/Server.php
index f9081c693..c6757509c 100644
--- a/workflow/engine/src/Services/Api/OAuth2/Server.php
+++ b/workflow/engine/src/Services/Api/OAuth2/Server.php
@@ -200,12 +200,12 @@ class Server implements iAuthenticate
 
         // verify if the client is not our local PM Designer client
         if ($token['client_id'] != self::getPmClientId()) {
-        //    return $allowed;
+            //return $allowed;
         }
 
         // making a local session verification for PM Web Designer Client
         if (! isset($_SESSION) || ! array_key_exists('USER_LOGGED', $_SESSION)) {
-        //    return false;
+            //return false;
         }
 
         return $allowed;
@@ -236,3 +236,4 @@ class Server implements iAuthenticate
         return array_keys($this->scope);
     }
 }
+
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Test.php b/workflow/engine/src/Services/Api/ProcessMaker/Test.php
index 79803ec93..dd9e7b086 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Test.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Test.php
@@ -37,7 +37,7 @@ class Test extends Api
         throw new RestException(400, "GET: Record not found. Record with id: $id does not exist!");
     }
 
-    public function post($request_data = NULL)
+    public function post($request_data = null)
     {
         $id = count($this->data) + 1;
         $this->data[$id] = array(
@@ -62,7 +62,7 @@ class Test extends Api
         return $this->data[$id];
     }
 
-    public function put($id, $request_data = NULL)
+    public function put($id, $request_data = null)
     {
         if (array_key_exists($id, $this->data)) {
             if (array_key_exists('name', $request_data)) {
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Type.php b/workflow/engine/src/Services/Api/ProcessMaker/Type.php
index 10ded7ef9..7ff03f1ea 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Type.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Type.php
@@ -191,9 +191,9 @@ class Type
     /**
      * @param integer $age {@choise 1,2}
      */
-    public function postInt($age='')
+    public function postInt($age = '')
     {
-        return '->'.$age;
+        return $age;
     }
 }
 
@@ -210,3 +210,4 @@ class Author
      */
     public $email = 'name@domain.com';
 }
+