diff --git a/server/client.go b/server/client.go
index aa511390..0c73b0dc 100644
--- a/server/client.go
+++ b/server/client.go
@@ -21,7 +21,7 @@ const (
 	defaultBufSize = 32768
 	// Scratch buffer size for the processMsg() calls.
 	msgScratchSize = 512
-	msgHeadProto = "MSG "
+	msgHeadProto   = "MSG "
 )
 
 const (
diff --git a/server/const.go b/server/const.go
index d8b88a7b..230f266b 100644
--- a/server/const.go
+++ b/server/const.go
@@ -35,7 +35,7 @@ const (
 	DEFAULT_PING_MAX_OUT  = 2
 
 	// CRLF string
-	CR_LF = "\r\n"
+	CR_LF     = "\r\n"
 	LEN_CR_LF = len(CR_LF)
 
 	// Write/Flush Deadlines
diff --git a/server/parser.go b/server/parser.go
index 866c416b..32855b6e 100644
--- a/server/parser.go
+++ b/server/parser.go
@@ -161,10 +161,10 @@ func (c *client) parse(buf []byte) error {
 				if c.msgBuf != nil {
 					c.msgBuf = append(c.msgBuf, b)
 				} else {
-					c.msgBuf = buf[c.as:i+1]
+					c.msgBuf = buf[c.as : i+1]
 				}
 				// strict check for proto
-				if len(c.msgBuf) != c.pa.size + LEN_CR_LF {
+				if len(c.msgBuf) != c.pa.size+LEN_CR_LF {
 					goto parseErr
 				}
 				c.processMsg(c.msgBuf)
diff --git a/server/parser_test.go b/server/parser_test.go
index 3fd7172d..b14fd075 100644
--- a/server/parser_test.go
+++ b/server/parser_test.go
@@ -170,7 +170,7 @@ func TestParsePub(t *testing.T) {
 	}
 
 	// Clear snapshots
-	c.argBuf, c.msgBuf, c.state  = nil, nil, OP_START
+	c.argBuf, c.msgBuf, c.state = nil, nil, OP_START
 
 	pub = []byte("PUB foo.bar INBOX.22 11\r\nhello world\r")
 	err = c.parse(pub)
@@ -245,7 +245,7 @@ func TestParseMsg(t *testing.T) {
 	}
 
 	// Clear snapshots
-	c.argBuf, c.msgBuf, c.state  = nil, nil, OP_START
+	c.argBuf, c.msgBuf, c.state = nil, nil, OP_START
 
 	pub = []byte("MSG foo.bar RSID:1:2 INBOX.22 11\r\nhello world\r")
 	err = c.parse(pub)
diff --git a/server/route.go b/server/route.go
index 50d9e0b3..ceb44f98 100644
--- a/server/route.go
+++ b/server/route.go
@@ -315,4 +315,4 @@ func (s *Server) numRoutes() int {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	return len(s.routes)
-}
\ No newline at end of file
+}
diff --git a/sublist/sublist.go b/sublist/sublist.go
index ea4ebe4e..2a8e6c2f 100644
--- a/sublist/sublist.go
+++ b/sublist/sublist.go
@@ -79,7 +79,7 @@ var (
 
 var (
 	ErrInvalidSubject = errors.New("Invalid Subject")
-	ErrNotFound = errors.New("No Matches Found")
+	ErrNotFound       = errors.New("No Matches Found")
 )
 
 // split will split a subject into tokens