diff --git a/algorithms_cpp/include/embb/algorithms/invoke.h b/algorithms_cpp/include/embb/algorithms/invoke.h
index d6dfd46..10dd818 100644
--- a/algorithms_cpp/include/embb/algorithms/invoke.h
+++ b/algorithms_cpp/include/embb/algorithms/invoke.h
@@ -96,8 +96,8 @@ class TaskWrapper {
     Function function,
     const embb::tasks::ExecutionPolicy& policy)
       : function_(function), task_() {
-    embb::tasks::Action action(embb::base::MakeFunction(*this, &TaskWrapper::Run),
-                         policy);
+    embb::tasks::Action action(embb::base::MakeFunction(
+      *this, &TaskWrapper::Run), policy);
     task_ = embb::tasks::Node::GetInstance().Spawn(action);
   }
 
diff --git a/mtapi_cpp/include/embb/mtapi/action.h b/mtapi_cpp/include/embb/mtapi/action.h
index 763c611..50f8d75 100644
--- a/mtapi_cpp/include/embb/mtapi/action.h
+++ b/mtapi_cpp/include/embb/mtapi/action.h
@@ -127,7 +127,8 @@ class Action {
     mtapi_action_attributes_t const * attributes
     ) {
     mtapi_status_t status;
-    handle_ = mtapi_action_create(job_id, func, node_local_data, node_local_data_size,
+    handle_ = mtapi_action_create(job_id, func,
+      node_local_data, node_local_data_size,
       attributes, &status);
     internal::CheckStatus(status);
   }
diff --git a/mtapi_cpp/include/embb/mtapi/action_attributes.h b/mtapi_cpp/include/embb/mtapi/action_attributes.h
index ea1ddb0..70f798b 100644
--- a/mtapi_cpp/include/embb/mtapi/action_attributes.h
+++ b/mtapi_cpp/include/embb/mtapi/action_attributes.h
@@ -40,7 +40,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class ActionAttributes {
-public:
+ public:
   /**
    * Constructs an ActionAttributes object.
    */
@@ -111,7 +111,7 @@ public:
     return attributes_;
   }
 
-private:
+ private:
   mtapi_action_attributes_t attributes_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/affinity.h b/mtapi_cpp/include/embb/mtapi/affinity.h
index 07cc4c1..c2e0cfe 100644
--- a/mtapi_cpp/include/embb/mtapi/affinity.h
+++ b/mtapi_cpp/include/embb/mtapi/affinity.h
@@ -39,7 +39,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class Affinity {
-public:
+ public:
   /**
    * Constructs an Affinity object.
    */
@@ -135,7 +135,7 @@ public:
     return affinity_;
   }
 
-private:
+ private:
   mtapi_affinity_t affinity_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/group_attributes.h b/mtapi_cpp/include/embb/mtapi/group_attributes.h
index 5fb576d..3f254f2 100644
--- a/mtapi_cpp/include/embb/mtapi/group_attributes.h
+++ b/mtapi_cpp/include/embb/mtapi/group_attributes.h
@@ -39,7 +39,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class GroupAttributes {
-public:
+ public:
   /**
    * Constructs a GroupAttributes object.
    */
@@ -60,7 +60,7 @@ public:
     return attributes_;
   }
 
-private:
+ private:
   mtapi_group_attributes_t attributes_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/job.h b/mtapi_cpp/include/embb/mtapi/job.h
index 1972b87..50eeec9 100644
--- a/mtapi_cpp/include/embb/mtapi/job.h
+++ b/mtapi_cpp/include/embb/mtapi/job.h
@@ -39,7 +39,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class Job {
-public:
+ public:
   /**
    * Constructs a Job.
    * The Job object will be invalid.
@@ -91,11 +91,11 @@ public:
     return handle_;
   }
 
-private:
+ private:
   mtapi_job_hndl_t handle_;
 };
 
 } // namespace mtapi
 } // namespace embb
 
-#endif // EMBB_MTAPI_GROUP_ATTRIBUTES_H_
+#endif // EMBB_MTAPI_JOB_H_
diff --git a/mtapi_cpp/include/embb/mtapi/node.h b/mtapi_cpp/include/embb/mtapi/node.h
index 41f4e00..071cfff 100644
--- a/mtapi_cpp/include/embb/mtapi/node.h
+++ b/mtapi_cpp/include/embb/mtapi/node.h
@@ -73,8 +73,7 @@ class Node {
     if (IsInitialized()) {
       EMBB_THROW(StatusException,
         "MTAPI: node was already initialized.");
-    }
-    else {
+    } else {
       NodeAttributes attributes; // default attributes
       node_instance_ = embb::base::Allocation::New<Node>(
         domain_id, node_id, attributes);
@@ -96,8 +95,7 @@ class Node {
     if (IsInitialized()) {
       EMBB_THROW(StatusException,
         "MTAPI: node was already initialized.");
-    }
-    else {
+    } else {
       node_instance_ = embb::base::Allocation::New<Node>(
         domain_id, node_id, attributes);
     }
@@ -121,8 +119,7 @@ class Node {
   static Node & GetInstance() {
     if (IsInitialized()) {
       return *node_instance_;
-    }
-    else {
+    } else {
       EMBB_THROW(StatusException,
         "MTAPI: node is not initialized.");
     }
@@ -137,8 +134,7 @@ class Node {
     if (IsInitialized()) {
       embb::base::Allocation::Delete(node_instance_);
       node_instance_ = NULL;
-    }
-    else {
+    } else {
       EMBB_THROW(StatusException,
         "MTAPI: node is not initialized.");
     }
diff --git a/mtapi_cpp/include/embb/mtapi/node_attributes.h b/mtapi_cpp/include/embb/mtapi/node_attributes.h
index 7874cf1..1dc104e 100644
--- a/mtapi_cpp/include/embb/mtapi/node_attributes.h
+++ b/mtapi_cpp/include/embb/mtapi/node_attributes.h
@@ -40,7 +40,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class NodeAttributes {
-public:
+ public:
   /**
    * Constructs a NodeAttributes object.
    */
@@ -226,7 +226,7 @@ public:
     return attributes_;
   }
 
-private:
+ private:
   mtapi_node_attributes_t attributes_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/queue_attributes.h b/mtapi_cpp/include/embb/mtapi/queue_attributes.h
index fe578f6..e5050b0 100644
--- a/mtapi_cpp/include/embb/mtapi/queue_attributes.h
+++ b/mtapi_cpp/include/embb/mtapi/queue_attributes.h
@@ -39,7 +39,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class QueueAttributes {
-public:
+ public:
   /**
    * Constructs a QueueAttributes object.
    */
@@ -166,7 +166,7 @@ public:
     return attributes_;
   }
 
-private:
+ private:
   mtapi_queue_attributes_t attributes_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/task.h b/mtapi_cpp/include/embb/mtapi/task.h
index 15172f2..40f3aaf 100644
--- a/mtapi_cpp/include/embb/mtapi/task.h
+++ b/mtapi_cpp/include/embb/mtapi/task.h
@@ -121,7 +121,7 @@ class Task {
   }
 
  private:
-  Task(mtapi_task_hndl_t handle)
+  explicit Task(mtapi_task_hndl_t handle)
     : handle_(handle) {
     // empty
   }
diff --git a/mtapi_cpp/include/embb/mtapi/task_attributes.h b/mtapi_cpp/include/embb/mtapi/task_attributes.h
index 7848e96..e743279 100644
--- a/mtapi_cpp/include/embb/mtapi/task_attributes.h
+++ b/mtapi_cpp/include/embb/mtapi/task_attributes.h
@@ -39,7 +39,7 @@ namespace mtapi {
  * \ingroup CPP_MTAPI
  */
 class TaskAttributes {
-public:
+ public:
   /**
    * Constructs a TaskAttributes object.
    */
@@ -115,7 +115,7 @@ public:
     return attributes_;
   }
 
-private:
+ private:
   mtapi_task_attributes_t attributes_;
 };
 
diff --git a/mtapi_cpp/include/embb/mtapi/task_context.h b/mtapi_cpp/include/embb/mtapi/task_context.h
index a3dc0ed..73df784 100644
--- a/mtapi_cpp/include/embb/mtapi/task_context.h
+++ b/mtapi_cpp/include/embb/mtapi/task_context.h
@@ -50,7 +50,7 @@ class TaskContext {
     : context_(task_context) {
     // empty
   }
-   
+
   /**
    * Queries whether the Task running in the TaskContext should finish.
    * \return \c true if the Task should finish, otherwise \c false
diff --git a/mtapi_cpp/test/mtapi_cpp_test_task.cc b/mtapi_cpp/test/mtapi_cpp_test_task.cc
index 695f038..b21ddf7 100644
--- a/mtapi_cpp/test/mtapi_cpp_test_task.cc
+++ b/mtapi_cpp/test/mtapi_cpp_test_task.cc
@@ -111,7 +111,8 @@ void TaskTest::TestBasic() {
   {
     embb::mtapi::Job job_error(JOB_TEST_ERROR, THIS_DOMAIN_ID);
 
-    embb::mtapi::Action action_error(JOB_TEST_ERROR, testErrorAction, embb::mtapi::ActionAttributes());
+    embb::mtapi::Action action_error(JOB_TEST_ERROR, testErrorAction,
+      embb::mtapi::ActionAttributes());
 
     std::string test;
     embb::mtapi::Task task = node.Start(job_error, "simple", &test);
diff --git a/tasks_cpp/test/tasks_cpp_test_task.h b/tasks_cpp/test/tasks_cpp_test_task.h
index f86b6fe..cbffac1 100644
--- a/tasks_cpp/test/tasks_cpp_test_task.h
+++ b/tasks_cpp/test/tasks_cpp_test_task.h
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MTAPI_CPP_TEST_MTAPI_CPP_TEST_TASK_H_
-#define MTAPI_CPP_TEST_MTAPI_CPP_TEST_TASK_H_
+#ifndef TASKS_CPP_TEST_TASKS_CPP_TEST_TASK_H_
+#define TASKS_CPP_TEST_TASKS_CPP_TEST_TASK_H_
 
 #include <partest/partest.h>
 
@@ -37,4 +37,4 @@ class TaskTest : public partest::TestCase {
   void TestBasic();
 };
 
-#endif // MTAPI_CPP_TEST_MTAPI_CPP_TEST_TASK_H_
+#endif // TASKS_CPP_TEST_TASKS_CPP_TEST_TASK_H_