diff --git a/istioctl/cmd/istioctl/authn.go b/istioctl/cmd/istioctl/authn.go
index d9e4b06879ce..3eccca62262c 100644
--- a/istioctl/cmd/istioctl/authn.go
+++ b/istioctl/cmd/istioctl/authn.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/cmd/istioctl/convert_ingress.go b/istioctl/cmd/istioctl/convert_ingress.go
index 814e300f9645..72e594ed8524 100644
--- a/istioctl/cmd/istioctl/convert_ingress.go
+++ b/istioctl/cmd/istioctl/convert_ingress.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Istio Authors.
+// Copyright 2017 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/cmd/istioctl/gendeployment/cmd.go b/istioctl/cmd/istioctl/gendeployment/cmd.go
index 0cff8fd691e9..b239098c7850 100644
--- a/istioctl/cmd/istioctl/gendeployment/cmd.go
+++ b/istioctl/cmd/istioctl/gendeployment/cmd.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Istio Authors.
+// Copyright 2017 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/cmd/istioctl/gendeployment/cmd_test.go b/istioctl/cmd/istioctl/gendeployment/cmd_test.go
index bb102b0992c4..5fe6afa688a0 100644
--- a/istioctl/cmd/istioctl/gendeployment/cmd_test.go
+++ b/istioctl/cmd/istioctl/gendeployment/cmd_test.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Istio Authors.
+// Copyright 2017 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/cmd/istioctl/gendeployment/yaml.go b/istioctl/cmd/istioctl/gendeployment/yaml.go
index 17759d01d741..2a45b6d23d48 100644
--- a/istioctl/cmd/istioctl/gendeployment/yaml.go
+++ b/istioctl/cmd/istioctl/gendeployment/yaml.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Istio Authors.
+// Copyright 2017 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/cmd/istioctl/rbac.go b/istioctl/cmd/istioctl/rbac.go
index 7fba912a25bf..015ded4dad2f 100644
--- a/istioctl/cmd/istioctl/rbac.go
+++ b/istioctl/cmd/istioctl/rbac.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/convert/ingress.go b/istioctl/pkg/convert/ingress.go
index 0b80cbd2e750..5fed4ca84d25 100644
--- a/istioctl/pkg/convert/ingress.go
+++ b/istioctl/pkg/convert/ingress.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/kubernetes/client.go b/istioctl/pkg/kubernetes/client.go
index ff8e862a627c..5a0c925607c1 100644
--- a/istioctl/pkg/kubernetes/client.go
+++ b/istioctl/pkg/kubernetes/client.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/writer/pilot/auth.go b/istioctl/pkg/writer/pilot/auth.go
index 81c08814f3ba..062a7a3dc867 100644
--- a/istioctl/pkg/writer/pilot/auth.go
+++ b/istioctl/pkg/writer/pilot/auth.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/writer/pilot/auth_test.go b/istioctl/pkg/writer/pilot/auth_test.go
index 152aad2b19dd..5733d3f59ebb 100644
--- a/istioctl/pkg/writer/pilot/auth_test.go
+++ b/istioctl/pkg/writer/pilot/auth_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/writer/pilot/status.go b/istioctl/pkg/writer/pilot/status.go
index 98a465198da8..5918e517935d 100644
--- a/istioctl/pkg/writer/pilot/status.go
+++ b/istioctl/pkg/writer/pilot/status.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/istioctl/pkg/writer/pilot/status_test.go b/istioctl/pkg/writer/pilot/status_test.go
index b0d8e0fcfe0a..df048c0da717 100644
--- a/istioctl/pkg/writer/pilot/status_test.go
+++ b/istioctl/pkg/writer/pilot/status_test.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pilot/pkg/model/gateway.go b/pilot/pkg/model/gateway.go
index a165686c9a5d..d9dbf05bc200 100644
--- a/pilot/pkg/model/gateway.go
+++ b/pilot/pkg/model/gateway.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pilot/pkg/networking/plugin/registry/registry.go b/pilot/pkg/networking/plugin/registry/registry.go
index 5ae3b9ca46f9..e240e2128bcb 100644
--- a/pilot/pkg/networking/plugin/registry/registry.go
+++ b/pilot/pkg/networking/plugin/registry/registry.go
@@ -1,4 +1,4 @@
-// Copyright 2018 Istio Authors.
+// Copyright 2018 Istio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pilot/test/server/echo/echo.go b/pilot/test/server/echo/echo.go
index c39b63c5eeec..c056915206f9 100644
--- a/pilot/test/server/echo/echo.go
+++ b/pilot/test/server/echo/echo.go
@@ -1,16 +1,16 @@
-//  Copyright 2018 Istio Authors
+// Copyright 2018 Istio Authors
 //
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package echo
 
diff --git a/pilot/test/server/echo/handler.go b/pilot/test/server/echo/handler.go
index 4675dfb9fa27..d50b0b799f70 100644
--- a/pilot/test/server/echo/handler.go
+++ b/pilot/test/server/echo/handler.go
@@ -1,16 +1,16 @@
-//  Copyright 2018 Istio Authors
+// Copyright 2018 Istio Authors
 //
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//     http://www.apache.org/licenses/LICENSE-2.0
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package echo