diff --git a/src/plugins/task/cgroup/task_cgroup_memory.c b/src/plugins/task/cgroup/task_cgroup_memory.c
index 267a8c4233129c0a162ba14a6c79992e13157898..a2485d56fb17d3f10add912856d6632a06358b30 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.c
+++ b/src/plugins/task/cgroup/task_cgroup_memory.c
@@ -383,7 +383,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
 	 * a task. The release_agent will have to lock the root memory cgroup
 	 * to avoid this scenario.
 	 */
-	if (xcgroup_create(&memory_ns,&memory_cg,"",0,0) != XCGROUP_SUCCESS) {
+	if (xcgroup_create(&memory_ns, &memory_cg, "",0,0) != XCGROUP_SUCCESS) {
 		error("task/cgroup: unable to create root memory xcgroup");
 		return SLURM_ERROR;
 	}
@@ -403,7 +403,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
 	 * are not working well so it will be really difficult to manage
 	 * addition/removal of memory amounts at this level. (kernel 2.6.34)
 	 */
-	if (xcgroup_create(&memory_ns,&user_memory_cg,
+	if (xcgroup_create(&memory_ns, &user_memory_cg,
 			    user_cgroup_path,
 			    getuid(),getgid()) != XCGROUP_SUCCESS) {
 		goto error;
@@ -412,7 +412,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
 		xcgroup_destroy(&user_memory_cg);
 		goto error;
 	}
-	if ( xcgroup_set_param(&user_memory_cg,"memory.use_hierarchy","1")
+	if ( xcgroup_set_param(&user_memory_cg, "memory.use_hierarchy", "1")
 	     != XCGROUP_SUCCESS ) {
 		error("task/cgroup: unable to ask for hierarchical accounting"
 		      "of user memcg '%s'",user_memory_cg.path);
diff --git a/src/slurmd/common/xcgroup.c b/src/slurmd/common/xcgroup.c
index f37bd5d955092a70686843ae32c0c26159d70923..ad4c0655927e790754b1e26d3521df914c3f04f7 100644
--- a/src/slurmd/common/xcgroup.c
+++ b/src/slurmd/common/xcgroup.c
@@ -466,7 +466,7 @@ int xcgroup_instanciate(xcgroup_t* cg)
 	file_path = cg->path;
 	uid = cg->uid;
 	gid = cg->gid;
-	create_only=0;
+	create_only = 0;
 	notify = cg->notify;
 
 	/* save current mask and apply working one */