diff --git a/intern/cycles/kernel/osl/nodes/node_brick_texture.osl b/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
index d6af5a21ce1..478d9457001 100644
--- a/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
@@ -41,8 +41,8 @@ float brick(point p, float mortar_size, float bias,
 	rownum = (int)floor(p[1] / row_height);
 	
 	if (offset_frequency && squash_frequency) {
-		brick_width *= ((int)(rownum) % squash_frequency ) ? 1.0 : squash_amount; /* squash */
-		offset = ((int)(rownum) % offset_frequency ) ? 0 : (brick_width * offset_amount); /* offset */
+		brick_width *= ((int)(rownum) % squash_frequency) ? 1.0 : squash_amount;                /* squash */
+		offset       = ((int)(rownum) % offset_frequency) ? 0 : (brick_width * offset_amount);  /* offset */
 	}
 
 	bricknum = (int)floor((p[0] + offset) / brick_width);
diff --git a/intern/cycles/kernel/osl/nodes/node_fresnel.osl b/intern/cycles/kernel/osl/nodes/node_fresnel.osl
index 172f4dd9843..e8d8e945f98 100644
--- a/intern/cycles/kernel/osl/nodes/node_fresnel.osl
+++ b/intern/cycles/kernel/osl/nodes/node_fresnel.osl
@@ -25,7 +25,7 @@ shader node_fresnel(
 	output float Fac = 0.0)
 {
 	float f = max(IOR, 1.0 + 1e-5);
-	float eta = backfacing()? 1.0 / f: f;
+	float eta = backfacing() ? 1.0 / f: f;
 	Fac = fresnel_dielectric(I, Normal, eta);
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl b/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
index 8b069248a35..f3fcce572cf 100644
--- a/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
+++ b/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
@@ -28,7 +28,7 @@ shader node_glass_bsdf(
 	output closure color BSDF = diffuse(Normal))
 {
 	float f = max(IOR, 1.0 + 1e-5);
-	float eta = backfacing()? 1.0 / f: f;
+	float eta = backfacing() ? 1.0 / f: f;
 	float Fr = fresnel_dielectric(I, Normal, eta);
 
 	if (distribution == "Sharp")
diff --git a/intern/cycles/kernel/osl/nodes/node_layer_weight.osl b/intern/cycles/kernel/osl/nodes/node_layer_weight.osl
index ea25d0c0e02..dc3eb81d712 100644
--- a/intern/cycles/kernel/osl/nodes/node_layer_weight.osl
+++ b/intern/cycles/kernel/osl/nodes/node_layer_weight.osl
@@ -29,7 +29,7 @@ shader node_layer_weight(
 
 	/* Fresnel */ 
 	float eta = max(1.0 - Blend, 1e-5);
-	eta = backfacing()? eta: 1.0 / eta;
+	eta = backfacing() ? eta : 1.0 / eta;
 	Fresnel = fresnel_dielectric(I, Normal, eta);
 
 	/* Facing */ 
@@ -37,7 +37,7 @@ shader node_layer_weight(
 
 	if (blend != 0.5) {
 		blend = clamp(blend, 0.0, 1.0); 
-		blend = (blend < 0.5)? 2.0 * blend: 0.5 / (1.0 - blend);
+		blend = (blend < 0.5) ? 2.0 * blend : 0.5 / (1.0 - blend);
 
 		Facing = pow(Facing, blend);
 	}
diff --git a/intern/cycles/kernel/osl/nodes/node_object_info.osl b/intern/cycles/kernel/osl/nodes/node_object_info.osl
index 21e50d8a43e..0d503258179 100644
--- a/intern/cycles/kernel/osl/nodes/node_object_info.osl
+++ b/intern/cycles/kernel/osl/nodes/node_object_info.osl
@@ -19,15 +19,14 @@
 #include "stdosl.h"
 
 shader node_object_info(
-    output point Location = point(0.0, 0.0, 0.0),
-    output float ObjectIndex = 0.0,
-    output float MaterialIndex = 0.0,
-    output float Random = 0.0
-    )
+	output point Location = point(0.0, 0.0, 0.0),
+	output float ObjectIndex = 0.0,
+	output float MaterialIndex = 0.0,
+	output float Random = 0.0)
 {
-    getattribute("std::object_location", Location);
-    getattribute("std::object_index", ObjectIndex);
-    getattribute("std::material_index", MaterialIndex);
-    getattribute("std::object_random", Random);
+	getattribute("std::object_location", Location);
+	getattribute("std::object_index", ObjectIndex);
+	getattribute("std::material_index", MaterialIndex);
+	getattribute("std::object_random", Random);
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_particle_info.osl b/intern/cycles/kernel/osl/nodes/node_particle_info.osl
index aadc2812865..ba51ccbd953 100644
--- a/intern/cycles/kernel/osl/nodes/node_particle_info.osl
+++ b/intern/cycles/kernel/osl/nodes/node_particle_info.osl
@@ -25,15 +25,14 @@ shader node_particle_info(
     output point Location = point(0.0, 0.0, 0.0),
     output float Size = 0.0,
     output vector Velocity = point(0.0, 0.0, 0.0),
-    output vector AngularVelocity = point(0.0, 0.0, 0.0)
-    )
+    output vector AngularVelocity = point(0.0, 0.0, 0.0))
 {
-    getattribute("std::particle_index", Index);
-    getattribute("std::particle_age", Age);
-    getattribute("std::particle_lifetime", Lifetime);
-    getattribute("std::particle_location", Location);
-    getattribute("std::particle_size", Size);
-    getattribute("std::particle_velocity", Velocity);
-    getattribute("std::particle_angular_velocity", AngularVelocity);
+	getattribute("std::particle_index", Index);
+	getattribute("std::particle_age", Age);
+	getattribute("std::particle_lifetime", Lifetime);
+	getattribute("std::particle_location", Location);
+	getattribute("std::particle_size", Size);
+	getattribute("std::particle_velocity", Velocity);
+	getattribute("std::particle_angular_velocity", AngularVelocity);
 }