diff --git a/core/math/triangulate.cpp b/core/math/triangulate.cpp
index 27b7c866756..1f5d5ed6b34 100644
--- a/core/math/triangulate.cpp
+++ b/core/math/triangulate.cpp
@@ -157,7 +157,10 @@ bool Triangulate::triangulate(const Vector<Vector2> &contour,Vector<int> &result
       m++;
 
       /* remove v from remaining polygon */
-      for(s=v,t=v+1;t<nv;s++,t++) V[s] = V[t]; nv--;
+      for(s=v,t=v+1;t<nv;s++,t++)
+	    V[s] = V[t];
+
+      nv--;
 
       /* resest error detection counter */
       count = 2*nv;
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
index 4804bc5630c..954d2c20f2e 100644
--- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp
+++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
@@ -175,8 +175,8 @@ void AudioDriverPulseAudio::finish() {
 	exit_thread = true;
 	Thread::wait_to_finish(thread);
 
-    if (pulse)
-        pa_simple_free(pulse);
+	if (pulse)
+		pa_simple_free(pulse);
 
 	if (samples_in) {
 		memdelete_arr(samples_in);
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index f0b6b7103c2..7b24e200b64 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -330,8 +330,8 @@ public:
 
 
 	virtual Vector<StackInfo> debug_get_current_stack_info() {
-	    if (Thread::get_main_ID()!=Thread::get_caller_ID())
-		return Vector<StackInfo>();
+		if (Thread::get_main_ID()!=Thread::get_caller_ID())
+			return Vector<StackInfo>();
 
 		Vector<StackInfo> csi;
 		csi.resize(_debug_call_stack_pos);
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index b69646432e6..5e665441536 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -41,13 +41,13 @@ void update_material(Ref<CanvasItemMaterial>mat,const Color& p_color,float h,flo
 	if (!sdr.is_valid())
 		return;
 
-		mat->set_shader_param("R",p_color.r);
-		mat->set_shader_param("G",p_color.g);
-		mat->set_shader_param("B",p_color.b);
-		mat->set_shader_param("H",h);
-		mat->set_shader_param("S",s);
-		mat->set_shader_param("V",v);
-		mat->set_shader_param("A",p_color.a);
+	mat->set_shader_param("R",p_color.r);
+	mat->set_shader_param("G",p_color.g);
+	mat->set_shader_param("B",p_color.b);
+	mat->set_shader_param("H",h);
+	mat->set_shader_param("S",s);
+	mat->set_shader_param("V",v);
+	mat->set_shader_param("A",p_color.a);
 }
 
 void ColorPicker::_notification(int p_what) {
@@ -397,9 +397,10 @@ void ColorPicker::_screen_input(const InputEvent &ev)
 		if (!r->get_rect().has_point(Point2(mev.global_x,mev.global_y)))
 			return;
 		Image img =r->get_screen_capture();
-		if (!img.empty())
+		if (!img.empty()) {
 			last_capture=img;
 			r->queue_screen_capture();
+		}
 		if (!last_capture.empty())
 			set_color(last_capture.get_pixel(mev.global_x,mev.global_y));
 	}