diff --git a/main.cpp b/main.cpp
index 048c9c68..a375f169 100644
--- a/main.cpp
+++ b/main.cpp
@@ -444,7 +444,8 @@ static void print_help()
 	fprintf(stderr, "Usage: spirv-cross [--output <output path>] [SPIR-V file] [--es] [--no-es] [--no-cfg-analysis] "
 	                "[--version <GLSL "
 	                "version>] [--dump-resources] [--help] [--force-temporary] [--cpp] [--cpp-interface-name <name>] "
-	                "[--metal] [--hlsl] [--shader-model] [--vulkan-semantics] [--flatten-ubo] [--fixup-clipspace] [--iterations iter] "
+	                "[--metal] [--hlsl] [--shader-model] [--vulkan-semantics] [--flatten-ubo] [--fixup-clipspace] "
+	                "[--iterations iter] "
 	                "[--pls-in format input-name] [--pls-out format output-name] [--remap source_name target_name "
 	                "components] [--extension ext] [--entry name] [--remove-unused-variables] "
 	                "[--remap-variable-type <variable_name> <new_variable_type>]\n");
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index bc386f4a..2daf61ea 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -1138,7 +1138,6 @@ void CompilerGLSL::emit_buffer_block_flattened(const SPIRVariable &var)
 		SPIRV_CROSS_THROW("All basic types in a flattened block must be the same.");
 }
 
-
 void CompilerGLSL::emit_interface_block(const SPIRVariable &var)
 {
 	auto &execution = get_entry_point();
@@ -1196,7 +1195,7 @@ void CompilerGLSL::emit_interface_block(const SPIRVariable &var)
 		// I/O variables which are struct types.
 		// To support this, flatten the struct into separate varyings instead.
 		if (type.basetype == SPIRType::Struct &&
-			((options.es && options.version < 310) || (!options.es && options.version < 150)))
+		    ((options.es && options.version < 310) || (!options.es && options.version < 150)))
 		{
 			if (!type.array.empty())
 				SPIRV_CROSS_THROW("Array of varying structs cannot be flattened to legacy-compatible varyings.");
@@ -3263,8 +3262,8 @@ const char *CompilerGLSL::index_to_swizzle(uint32_t index)
 	}
 }
 
-string CompilerGLSL::access_chain_internal(uint32_t base, const uint32_t *indices, uint32_t count, bool index_is_literal,
-                                           bool chain_only, bool *need_transpose)
+string CompilerGLSL::access_chain_internal(uint32_t base, const uint32_t *indices, uint32_t count,
+                                           bool index_is_literal, bool chain_only, bool *need_transpose)
 {
 	string expr;
 	if (!chain_only)
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
index 8067b64c..cf1e0b18 100644
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@@ -1305,7 +1305,8 @@ void CompilerMSL::emit_fixup()
 }
 
 // Returns a declaration for a structure member.
-string CompilerMSL::member_decl(const SPIRType &type, const SPIRType &membertype, uint32_t index, const string &qualifier)
+string CompilerMSL::member_decl(const SPIRType &type, const SPIRType &membertype, uint32_t index,
+                                const string &qualifier)
 {
 	return join(type_to_glsl(membertype), " ", qualifier, to_member_name(type, index), type_to_array_glsl(membertype),
 	            member_attribute_qualifier(type, index));