diff --git a/auth.go b/auth.go
index 9e1eea9..f05dab7 100644
--- a/auth.go
+++ b/auth.go
@@ -29,7 +29,7 @@ func AuthReady() bool {
 }
 
 func AuthFetch(username string) (string, string, error) {
-	if ! AuthReady() {
+	if !AuthReady() {
 		return "", "", errors.New("Authentication file not specified. Call LoadFile() first")
 	}
 
@@ -65,4 +65,3 @@ func AuthCheckPassword(username string, secret string) error {
 	}
 	return errors.New("Password invalid")
 }
-
diff --git a/config.go b/config.go
index 500828a..01c6700 100644
--- a/config.go
+++ b/config.go
@@ -11,21 +11,21 @@ const (
 )
 
 var (
-	logFile    = flag.String("logfile", "/var/log/smtprelay.log", "Path to logfile")
-	hostName   = flag.String("hostname", "localhost.localdomain", "Server hostname")
-	welcomeMsg = flag.String("welcome_msg", "", "Welcome message for SMTP session")
-	listen     = flag.String("listen", "127.0.0.1:25 [::1]:25", "Address and port to listen for incoming SMTP")
-	localCert  = flag.String("local_cert", "", "SSL certificate for STARTTLS/TLS")
-	localKey   = flag.String("local_key", "", "SSL private key for STARTTLS/TLS")
-	localForceTLS = flag.Bool("local_forcetls", false, "Force STARTTLS (needs local_cert and local_key)")
-	allowedNets = flag.String("allowed_nets", "127.0.0.1/8 ::1/128", "Networks allowed to send mails")
-	allowedSender = flag.String("allowed_sender", "", "Regular expression for valid FROM EMail adresses")
+	logFile           = flag.String("logfile", "/var/log/smtprelay.log", "Path to logfile")
+	hostName          = flag.String("hostname", "localhost.localdomain", "Server hostname")
+	welcomeMsg        = flag.String("welcome_msg", "", "Welcome message for SMTP session")
+	listen            = flag.String("listen", "127.0.0.1:25 [::1]:25", "Address and port to listen for incoming SMTP")
+	localCert         = flag.String("local_cert", "", "SSL certificate for STARTTLS/TLS")
+	localKey          = flag.String("local_key", "", "SSL private key for STARTTLS/TLS")
+	localForceTLS     = flag.Bool("local_forcetls", false, "Force STARTTLS (needs local_cert and local_key)")
+	allowedNets       = flag.String("allowed_nets", "127.0.0.1/8 ::1/128", "Networks allowed to send mails")
+	allowedSender     = flag.String("allowed_sender", "", "Regular expression for valid FROM EMail adresses")
 	allowedRecipients = flag.String("allowed_recipients", "", "Regular expression for valid TO EMail adresses")
-	allowedUsers = flag.String("allowed_users", "", "Path to file with valid users/passwords")
-	remoteHost = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server")
-	remoteUser = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server")
-	remotePass = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server")
-	versionInfo= flag.Bool("version", false, "Show version information")
+	allowedUsers      = flag.String("allowed_users", "", "Path to file with valid users/passwords")
+	remoteHost        = flag.String("remote_host", "smtp.gmail.com:587", "Outgoing SMTP server")
+	remoteUser        = flag.String("remote_user", "", "Username for authentication on outgoing SMTP server")
+	remotePass        = flag.String("remote_pass", "", "Password for authentication on outgoing SMTP server")
+	versionInfo       = flag.Bool("version", false, "Show version information")
 )
 
 func ConfigLoad() {
diff --git a/main.go b/main.go
index d5f18c6..d0c449d 100644
--- a/main.go
+++ b/main.go
@@ -25,7 +25,7 @@ func connectionChecker(peer smtpd.Peer) error {
 
 	nets := strings.Split(*allowedNets, " ")
 
-	for i := range(nets) {
+	for i := range nets {
 		_, allowedNet, _ := net.ParseCIDR(nets[i])
 
 		if allowedNet.Contains(peerIP) {
@@ -125,7 +125,7 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
 		env.Data,
 	)
 	if err != nil {
-		log.Printf("delivery failed: %v\n", err);
+		log.Printf("delivery failed: %v\n", err)
 		return smtpd.Error{Code: 554, Message: "Forwarding failed"}
 	}
 
@@ -144,7 +144,7 @@ func main() {
 	}
 
 	if *logFile != "" {
-		f, err := os.OpenFile(*logFile, os.O_WRONLY | os.O_CREATE | os.O_APPEND, 0600)
+		f, err := os.OpenFile(*logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
 		if err != nil {
 			log.Fatalf("Error opening logfile: %v", err)
 		}
@@ -155,7 +155,7 @@ func main() {
 
 	listeners := strings.Split(*listen, " ")
 
-	for i := range(listeners) {
+	for i := range listeners {
 		listener := listeners[i]
 
 		server := &smtpd.Server{
@@ -191,13 +191,13 @@ func main() {
 				log.Fatal(err)
 			}
 
-			server.TLSConfig = &tls.Config {
+			server.TLSConfig = &tls.Config{
 				PreferServerCipherSuites: true,
 				MinVersion:               tls.VersionTLS11,
 
 				// Ciphersuites as defined in stock Go but without 3DES
 				// https://golang.org/src/crypto/tls/cipher_suites.go
-				CipherSuites: []uint16 {
+				CipherSuites: []uint16{
 					tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
 					tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
 					tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -216,7 +216,7 @@ func main() {
 					tls.TLS_RSA_WITH_AES_128_CBC_SHA,
 					tls.TLS_RSA_WITH_AES_256_CBC_SHA,
 				},
-				Certificates: [] tls.Certificate{cert},
+				Certificates: []tls.Certificate{cert},
 			}
 			server.ForceTLS = *localForceTLS
 
@@ -238,13 +238,13 @@ func main() {
 				log.Fatal(err)
 			}
 
-			server.TLSConfig = &tls.Config {
+			server.TLSConfig = &tls.Config{
 				PreferServerCipherSuites: true,
 				MinVersion:               tls.VersionTLS11,
 
 				// Ciphersuites as defined in stock Go but without 3DES
 				// https://golang.org/src/crypto/tls/cipher_suites.go
-				CipherSuites: []uint16 {
+				CipherSuites: []uint16{
 					tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
 					tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
 					tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -263,7 +263,7 @@ func main() {
 					tls.TLS_RSA_WITH_AES_128_CBC_SHA,
 					tls.TLS_RSA_WITH_AES_256_CBC_SHA,
 				},
-				Certificates: [] tls.Certificate{cert},
+				Certificates: []tls.Certificate{cert},
 			}
 
 			log.Printf("Listen on %s (TLS) ...\n", listener)