diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 3dce804c543..6011de0bddb 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -386,7 +386,7 @@ extern "C" float *smoke_turbulence_get_flame(WTURBULENCE *wt)
 
 extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, int *res)
 {
-	if(wt) {
+	if (wt) {
 		Vec3Int r = wt->getResBig();
 		res[0] = r[0];
 		res[1] = r[1];
@@ -396,9 +396,9 @@ extern "C" void smoke_turbulence_get_res(WTURBULENCE *wt, int *res)
 
 extern "C" int smoke_turbulence_get_cells(WTURBULENCE *wt)
 {
-	if(wt) {
+	if (wt) {
 		Vec3Int r = wt->getResBig();
-		return r[0]*r[1]*r[2];
+		return r[0] * r[1] * r[2];
 	}
 	return 0;
 }
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 76ed8467c8f..93c776ae30e 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -75,12 +75,9 @@ BLI_STATIC_ASSERT(sizeof(((CustomData *)NULL)->typemap) /
 typedef struct LayerTypeInfo {
 	int size;          /* the memory size of one element of this layer's data */
 
-	/**
-	 * name of the struct used, for file writing */
+	/** name of the struct used, for file writing */
 	const char *structname;
-	/**
-	 * number of structs per element, for file writing
-	 * (set to zero skips writing this data to disk/undo) */
+	/** number of structs per element, for file writing */
 	int structnum;
 
 	/**
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b49e392d1f4..8aa879a354b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7144,8 +7144,8 @@ static void do_version_logic_264(ListBase *regionbase)
 	
 	/* view settings for logic changed */
 	for (ar = regionbase->first; ar; ar = ar->next) {
-		if(ar->regiontype == RGN_TYPE_WINDOW) {
-			if (ar->v2d.keeptot==0) {
+		if (ar->regiontype == RGN_TYPE_WINDOW) {
+			if (ar->v2d.keeptot == 0) {
 				ar->v2d.maxzoom = 1.5f;
 				
 				ar->v2d.keepzoom = V2D_KEEPZOOM | V2D_LIMITZOOM | V2D_KEEPASPECT;
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index c0a8f6582f6..578619abe1a 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1593,11 +1593,11 @@ void ui_popup_block_scrolltest(uiBlock *block)
 
 	/* mark buttons overlapping arrows, if we have them */
 	for (bt = block->buttons.first; bt; bt = bt->next) {
-		if(block->flag & UI_BLOCK_CLIPBOTTOM) {
+		if (block->flag & UI_BLOCK_CLIPBOTTOM) {
 			if (bt->rect.ymin < block->rect.ymin + 12)
 				bt->flag |= UI_SCROLLED;
 		}
-		if(block->flag & UI_BLOCK_CLIPTOP) {
+		if (block->flag & UI_BLOCK_CLIPTOP) {
 			if (bt->rect.ymax > block->rect.ymax - 12)
 				bt->flag |= UI_SCROLLED;
 		}