diff --git a/ridlbe/c++11/templates/cli/hdr/ami/attribute.erb b/ridlbe/c++11/templates/cli/hdr/ami/attribute.erb
index ff5d8353..c5a80828 100644
--- a/ridlbe/c++11/templates/cli/hdr/ami/attribute.erb
+++ b/ridlbe/c++11/templates/cli/hdr/ami/attribute.erb
@@ -2,17 +2,13 @@
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
 //@{
-void
-get_<%= name %> (<%= scoped_cxx_in_type %> ami_return_val);
+void get_<%= name %> (<%= scoped_cxx_in_type %> ami_return_val);
 
-void
-get_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
+void get_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
 % unless is_readonly?
 
-void
-set_<%= name %> ();
+void set_<%= name %> ();
 
-void
-set_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
+void set_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
 % end
 //@}
diff --git a/ridlbe/c++11/templates/cli/hdr/ami/attribute_amic.erb b/ridlbe/c++11/templates/cli/hdr/ami/attribute_amic.erb
index 2fc5370a..e9fe9779 100644
--- a/ridlbe/c++11/templates/cli/hdr/ami/attribute_amic.erb
+++ b/ridlbe/c++11/templates/cli/hdr/ami/attribute_amic.erb
@@ -1,12 +1,10 @@
 
 // generated from <%= ridl_template_path %>
-void
-<%= sendc_prefix_get %><%= name %> (
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler);
+void <%= sendc_prefix_get %><%= name %> (
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler);
 % unless is_readonly?
 
-void
-<%= sendc_prefix_set %><%= name %> (
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler,
-    <%= cxx_in_type %> _x11_<%= cxxname %>);
+void <%= sendc_prefix_set %><%= name %> (
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler,
+  <%= cxx_in_type %> _x11_<%= cxxname %>);
 % end
diff --git a/ridlbe/c++11/templates/cli/hdr/ami/operation.erb b/ridlbe/c++11/templates/cli/hdr/ami/operation.erb
index a8c018db..36b97aa2 100644
--- a/ridlbe/c++11/templates/cli/hdr/ami/operation.erb
+++ b/ridlbe/c++11/templates/cli/hdr/ami/operation.erb
@@ -11,5 +11,4 @@ void
     <%= _arg.direction == :out ? _arg.scoped_cxx_in_type : _arg.scoped_cxx_inout_type%> <%= _arg.cxxname %><%= _args.empty? ? ');' : ',' %>
 %   end
 
-void
-<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
+void <%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
diff --git a/ridlbe/c++11/templates/cli/hdr/ami/operation_amic.erb b/ridlbe/c++11/templates/cli/hdr/ami/operation_amic.erb
index 240f3518..aab98b67 100644
--- a/ridlbe/c++11/templates/cli/hdr/ami/operation_amic.erb
+++ b/ridlbe/c++11/templates/cli/hdr/ami/operation_amic.erb
@@ -1,9 +1,8 @@
 // generated from <%= ridl_template_path %>
 %   _args = in_arguments.dup
-void
-<%= sendc_prefix %><%= name %> (
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler<%= _args.empty? ? ');' : ',' %>
+void <%= sendc_prefix %><%= name %> (
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler<%= _args.empty? ? ');' : ',' %>
 %   while !_args.empty?
 %     _arg = _args.shift
-    <%= _arg.stub_arg_type %> <%= _arg.cxxname %><%= _args.empty? ? ');' : ',' %>
+  <%= _arg.stub_arg_type %> <%= _arg.cxxname %><%= _args.empty? ? ');' : ',' %>
 %   end
diff --git a/ridlbe/c++11/templates/cli/prx/ami/attribute.erb b/ridlbe/c++11/templates/cli/prx/ami/attribute.erb
index 3be0f589..f4551001 100644
--- a/ridlbe/c++11/templates/cli/prx/ami/attribute.erb
+++ b/ridlbe/c++11/templates/cli/prx/ami/attribute.erb
@@ -1,14 +1,14 @@
 
 // generated from <%= ridl_template_path %>
 static void get_<%= name %>_reply_stub (
-      TAO_InputCDR &_tao_reply_cdr,
-      TAO_MESSAGING::ReplyHandler_ptr _tao_reply_handler,
-      TAO_CORBA::ULong reply_status);
+  TAO_InputCDR &_tao_reply_cdr,
+  TAO_MESSAGING::ReplyHandler_ptr _tao_reply_handler,
+  TAO_CORBA::ULong reply_status);
 % unless is_readonly?
 
 static void set_<%= name %>_reply_stub (
-      TAO_InputCDR &_tao_reply_cdr,
-      TAO_MESSAGING::ReplyHandler_ptr _reply_handler,
-      TAO_CORBA::ULong reply_status);
+  TAO_InputCDR &_tao_reply_cdr,
+  TAO_MESSAGING::ReplyHandler_ptr _reply_handler,
+  TAO_CORBA::ULong reply_status);
 
 % end
diff --git a/ridlbe/c++11/templates/cli/prx/ami/operation.erb b/ridlbe/c++11/templates/cli/prx/ami/operation.erb
index bdb82d22..44668d68 100644
--- a/ridlbe/c++11/templates/cli/prx/ami/operation.erb
+++ b/ridlbe/c++11/templates/cli/prx/ami/operation.erb
@@ -1,5 +1,5 @@
 // generated from <%= ridl_template_path %>
 static void <%= name %>_reply_stub (
-      TAO_InputCDR &_tao_reply_cdr,
-      TAO_MESSAGING::ReplyHandler_ptr _tao_reply_handler,
-      TAO_CORBA::ULong reply_status);
+  TAO_InputCDR &_tao_reply_cdr,
+  TAO_MESSAGING::ReplyHandler_ptr _tao_reply_handler,
+  TAO_CORBA::ULong reply_status);
diff --git a/ridlbe/c++11/templates/cli/src/ami/attribute_amic.erb b/ridlbe/c++11/templates/cli/src/ami/attribute_amic.erb
index c3c12af9..fa7a0743 100644
--- a/ridlbe/c++11/templates/cli/src/ami/attribute_amic.erb
+++ b/ridlbe/c++11/templates/cli/src/ami/attribute_amic.erb
@@ -1,9 +1,8 @@
 % unless interface.is_local?
 
 // generated from <%= ridl_template_path %>
-void
-<%= interface.amic_scoped_cxxname %>::<%= sendc_prefix_get %><%= name %>(
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler)
+void <%= interface.amic_scoped_cxxname %>::<%= sendc_prefix_get %><%= name %>(
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler)
 {
 %   if interface.is_abstract?
   if (!this->_is_object ())
@@ -58,10 +57,9 @@ void
 }
 
 %   unless is_readonly?
-void
-<%= interface.amic_scoped_cxxname %>::<%= sendc_prefix_set %><%= name %>(
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler,
-    <%= cxx_in_type %> _x11_<%= cxxname %>)
+void <%= interface.amic_scoped_cxxname %>::<%= sendc_prefix_set %><%= name %>(
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler,
+  <%= cxx_in_type %> _x11_<%= cxxname %>)
 {
 %   if interface.is_abstract?
   if (!this->_is_object ())
diff --git a/ridlbe/c++11/templates/cli/src/ami/operation_amic.erb b/ridlbe/c++11/templates/cli/src/ami/operation_amic.erb
index 46af365b..6b69b6dc 100644
--- a/ridlbe/c++11/templates/cli/src/ami/operation_amic.erb
+++ b/ridlbe/c++11/templates/cli/src/ami/operation_amic.erb
@@ -2,12 +2,11 @@
 
 // generated from <%= ridl_template_path %>
 %     _args = in_arguments.dup
-void
-<%= interface.amic_scoped_cxxname %>::<%= sendc_prefix %><%= name %> (
-    <%= interface.handler_scoped_cxx_in_type %> ami_handler<%= _args.empty? ? ')' : ',' %>
+void <%= interface.amic_scoped_cxxname %>::<%= sendc_prefix %><%= name %> (
+  <%= interface.handler_scoped_cxx_in_type %> ami_handler<%= _args.empty? ? ')' : ',' %>
 %     while !_args.empty?
 %       _arg = _args.shift
-    <%= _arg.stub_arg_type %> <%= _arg.cxxname %><%= _args.empty? ? ')' : ',' %>
+  <%= _arg.stub_arg_type %> <%= _arg.cxxname %><%= _args.empty? ? ')' : ',' %>
 %     end
 {
 %     if interface.is_abstract?
diff --git a/ridlbe/c++11/templates/srv/prx/ami/interface_post.erb b/ridlbe/c++11/templates/srv/prx/ami/interface_post.erb
index 4d4d36be..6a3373fc 100644
--- a/ridlbe/c++11/templates/srv/prx/ami/interface_post.erb
+++ b/ridlbe/c++11/templates/srv/prx/ami/interface_post.erb
@@ -3,34 +3,34 @@
 %all_operations.each do |_op|
 %   unless _op.is_inherited?
   static void <%= _op.name %>_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
   static void <%= _op.name %>_excep_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
 %   end
 %end
 %all_attributes.each do |_att|
 %   unless _att.is_inherited?
   static void get_<%= _att.name %>_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
   static void get_<%= _att.name %>_excep_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
 %   unless _att.is_readonly?
   static void set_<%= _att.name %>_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
   static void set_<%= _att.name %>_excep_skel (
-      TAO_ServerRequest & server_request,
-      TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
-      skel_type& servant);
+    TAO_ServerRequest & server_request,
+    TAO_TAO::Portable_Server::Servant_Upcall * servant_upcall,
+    skel_type& servant);
 %     end
 %   end
 %end