diff --git a/cmd/common.go b/cmd/common.go
index d64c821..60caab9 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -8,10 +8,8 @@ import (
 )
 
 const (
-	header = `//
-// CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
+	header = `// CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package %s
 `
 	compositeClzTemplate = `type %s struct {
diff --git a/test/clonefn/mockc_clonedFuncs_test.go b/test/clonefn/mockc_clonedFuncs_test.go
index 1f215b0..ab662d6 100644
--- a/test/clonefn/mockc_clonedFuncs_test.go
+++ b/test/clonefn/mockc_clonedFuncs_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package clonefn
 
 import (
diff --git a/test/clonefn/mockc_mockFmt_test.go b/test/clonefn/mockc_mockFmt_test.go
index 74cd229..9f30513 100644
--- a/test/clonefn/mockc_mockFmt_test.go
+++ b/test/clonefn/mockc_mockFmt_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package clonefn
 
 import (
diff --git a/test/clonefn/mockc_mockJson_test.go b/test/clonefn/mockc_mockJson_test.go
index 9512196..f64ccca 100644
--- a/test/clonefn/mockc_mockJson_test.go
+++ b/test/clonefn/mockc_mockJson_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package clonefn
 
 import (
diff --git a/test/foo/mockc_FooMock_test.go b/test/foo/mockc_FooMock_test.go
index 23ec6b7..d982450 100644
--- a/test/foo/mockc_FooMock_test.go
+++ b/test/foo/mockc_FooMock_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package foo
 
 import (
diff --git a/test/foo/mockc_testFoo_test.go b/test/foo/mockc_testFoo_test.go
index c3bed85..4822ffd 100644
--- a/test/foo/mockc_testFoo_test.go
+++ b/test/foo/mockc_testFoo_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package foo
 
 import (
diff --git a/test/mockclz/mockc_cloneSourceClz_test.go b/test/mockclz/mockc_cloneSourceClz_test.go
index 3b3ee98..83508ee 100644
--- a/test/mockclz/mockc_cloneSourceClz_test.go
+++ b/test/mockclz/mockc_cloneSourceClz_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockclz
 
 import (
diff --git a/test/mockfn/mockc_mockFmt_test.go b/test/mockfn/mockc_mockFmt_test.go
index 3d1c818..c27f406 100644
--- a/test/mockfn/mockc_mockFmt_test.go
+++ b/test/mockfn/mockc_mockFmt_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockfn/mockc_mockJson_test.go b/test/mockfn/mockc_mockJson_test.go
index 2ee4719..7685e02 100644
--- a/test/mockfn/mockc_mockJson_test.go
+++ b/test/mockfn/mockc_mockJson_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockfn/mockc_mockLibfn_test.go b/test/mockfn/mockc_mockLibfn_test.go
index c838c3f..5aa6675 100644
--- a/test/mockfn/mockc_mockLibfn_test.go
+++ b/test/mockfn/mockc_mockLibfn_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockfn/mockc_mockSampleClz2_test.go b/test/mockfn/mockc_mockSampleClz2_test.go
index 02d1125..2db1cad 100644
--- a/test/mockfn/mockc_mockSampleClz2_test.go
+++ b/test/mockfn/mockc_mockSampleClz2_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockfn/mockc_mockSampleClz3_test.go b/test/mockfn/mockc_mockSampleClz3_test.go
index 65b66c1..7c80789 100644
--- a/test/mockfn/mockc_mockSampleClz3_test.go
+++ b/test/mockfn/mockc_mockSampleClz3_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockfn/mockc_mockSampleClz_test.go b/test/mockfn/mockc_mockSampleClz_test.go
index 39b0dbc..b24c726 100644
--- a/test/mockfn/mockc_mockSampleClz_test.go
+++ b/test/mockfn/mockc_mockSampleClz_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockfn
 
 import (
diff --git a/test/mockintf/mockc_MockSampleInterface_test.go b/test/mockintf/mockc_MockSampleInterface_test.go
index 68a8643..4923da4 100644
--- a/test/mockintf/mockc_MockSampleInterface_test.go
+++ b/test/mockintf/mockc_MockSampleInterface_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockintf
 
 import (
diff --git a/test/mockintf/mockc_mockFoo_test.go b/test/mockintf/mockc_mockFoo_test.go
index 32817b6..205e175 100644
--- a/test/mockintf/mockc_mockFoo_test.go
+++ b/test/mockintf/mockc_mockFoo_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockintf
 
 import (
diff --git a/test/mockintf/mockc_mockSecretsInterface_test.go b/test/mockintf/mockc_mockSecretsInterface_test.go
index d230ffb..44eb082 100644
--- a/test/mockintf/mockc_mockSecretsInterface_test.go
+++ b/test/mockintf/mockc_mockSecretsInterface_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package mockintf
 
 import (
diff --git a/test/yaml/mockc_MockSampleInterface_test.go b/test/yaml/mockc_MockSampleInterface_test.go
index de25b63..1716c44 100644
--- a/test/yaml/mockc_MockSampleInterface_test.go
+++ b/test/yaml/mockc_MockSampleInterface_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockFmt_test.go b/test/yaml/mockc_mockFmt_test.go
index ad44925..859b8de 100644
--- a/test/yaml/mockc_mockFmt_test.go
+++ b/test/yaml/mockc_mockFmt_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockFmtclonedFuncs_test.go b/test/yaml/mockc_mockFmtclonedFuncs_test.go
index 8fe7b52..73128fc 100644
--- a/test/yaml/mockc_mockFmtclonedFuncs_test.go
+++ b/test/yaml/mockc_mockFmtclonedFuncs_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockFoo_test.go b/test/yaml/mockc_mockFoo_test.go
index 8483c2c..ab3a0b2 100644
--- a/test/yaml/mockc_mockFoo_test.go
+++ b/test/yaml/mockc_mockFoo_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockJson_test.go b/test/yaml/mockc_mockJson_test.go
index 997ead7..2038206 100644
--- a/test/yaml/mockc_mockJson_test.go
+++ b/test/yaml/mockc_mockJson_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockSampleClz2_test.go b/test/yaml/mockc_mockSampleClz2_test.go
index 8d40367..42f9b05 100644
--- a/test/yaml/mockc_mockSampleClz2_test.go
+++ b/test/yaml/mockc_mockSampleClz2_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockSampleClz3_test.go b/test/yaml/mockc_mockSampleClz3_test.go
index 817de4c..86fd41f 100644
--- a/test/yaml/mockc_mockSampleClz3_test.go
+++ b/test/yaml/mockc_mockSampleClz3_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (
diff --git a/test/yaml/mockc_mockSampleClz_test.go b/test/yaml/mockc_mockSampleClz_test.go
index a5ee4bf..dc45198 100644
--- a/test/yaml/mockc_mockSampleClz_test.go
+++ b/test/yaml/mockc_mockSampleClz_test.go
@@ -1,7 +1,5 @@
-//
 // CODE GENERATED AUTOMATICALLY WITH github.com/kelveny/mockcompose
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-//
 package yaml
 
 import (