diff --git a/cmd/eksterd/main.go b/cmd/eksterd/main.go
index 06feda2..904d789 100644
--- a/cmd/eksterd/main.go
+++ b/cmd/eksterd/main.go
@@ -1,5 +1,17 @@
+// Copyright (C) 2018 Peter Stuifzand
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+// later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with this program. If not,
+// see <http://www.gnu.org/licenses/>.
+
 /*
-Package main contains the main command for the Microsub server.
+Eksterd is a microsub server that is extendable.
 */
 package main
 
@@ -17,8 +29,8 @@ import (
 	"p83.nl/go/ekster/pkg/server"
 )
 
-// Constants
 const (
+	// ClientID is used to identify the server when we make authentication requests.
 	ClientID string = "https://p83.nl/microsub-client"
 )
 
diff --git a/cmd/eksterd/memory.go b/cmd/eksterd/memory.go
index 8443921..238f838 100644
--- a/cmd/eksterd/memory.go
+++ b/cmd/eksterd/memory.go
@@ -1,21 +1,3 @@
-/*
-Package main runs the microsub server
-
-Copyright (C) 2018  Peter Stuifzand
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package main
 
 import (
diff --git a/cmd/eksterd/micropub.go b/cmd/eksterd/micropub.go
index 878924a..9a5749b 100644
--- a/cmd/eksterd/micropub.go
+++ b/cmd/eksterd/micropub.go
@@ -1,20 +1,3 @@
-/*
-   ekster - microsub server
-   Copyright (C) 2018  Peter Stuifzand
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package main
 
 import (