diff --git a/client/handlers.go b/client/handlers.go
index a170cc0..0923f4d 100644
--- a/client/handlers.go
+++ b/client/handlers.go
@@ -97,7 +97,7 @@ func (conn *Conn) h_JOIN(line *Line) {
 		// first we've seen of this channel, so should be us joining it
 		// NOTE this will also take care of n == nil && ch == nil
 		if n != conn.Me {
-			logging.Warn("irc.JOIN(): JOIN to unknown channel %s recieved " +
+			logging.Warn("irc.JOIN(): JOIN to unknown channel %s recieved "+
 				"from (non-me) nick %s", line.Args[0], line.Nick)
 			return
 		}
diff --git a/client/handlers_test.go b/client/handlers_test.go
index b2f419f..7e806ae 100644
--- a/client/handlers_test.go
+++ b/client/handlers_test.go
@@ -131,7 +131,7 @@ func TestJOIN(t *testing.T) {
 	// verifying their expected side-effects instead. Fixing this requires
 	// significant effort to move Conn to being a mockable interface type
 	// instead of a concrete struct. I'm not sure how feasible this is :-/
-	// 
+	//
 	// Soon, we'll find out :-)
 
 	m, c := setUp(t)
diff --git a/client/nickchan.go b/client/nickchan.go
index 17bffec..bc6afa4 100644
--- a/client/nickchan.go
+++ b/client/nickchan.go
@@ -130,7 +130,7 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
 			if len(modeargs) != 0 {
 				ch.Modes.Key, modeargs = modeargs[0], modeargs[1:]
 			} else {
-				logging.Warn("irc.ParseChanModes(): not enough arguments to " +
+				logging.Warn("irc.ParseChanModes(): not enough arguments to "+
 					"process MODE %s %s%s", ch.Name, modestr, m)
 			}
 		case 'l':
@@ -138,7 +138,7 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
 				ch.Modes.Limit, _ = strconv.Atoi(modeargs[0])
 				modeargs = modeargs[1:]
 			} else {
-				logging.Warn("irc.ParseChanModes(): not enough arguments to " +
+				logging.Warn("irc.ParseChanModes(): not enough arguments to "+
 					"process MODE %s %s%s", ch.Name, modestr, m)
 			}
 		case 'q', 'a', 'o', 'h', 'v':
@@ -159,11 +159,11 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
 					}
 					modeargs = modeargs[1:]
 				} else {
-					logging.Warn("irc.ParseChanModes(): untracked nick %s " +
+					logging.Warn("irc.ParseChanModes(): untracked nick %s "+
 						"recieved MODE on channel %s", modeargs[0], ch.Name)
 				}
 			} else {
-				logging.Warn("irc.ParseChanModes(): not enough arguments to " +
+				logging.Warn("irc.ParseChanModes(): not enough arguments to "+
 					"process MODE %s %s%s", ch.Name, modestr, m)
 			}
 		}
@@ -208,7 +208,7 @@ func (ch *Channel) AddNick(n *Nick) {
 		ch.Nicks[n] = new(ChanPrivs)
 		n.Channels[ch] = ch.Nicks[n]
 	} else {
-		logging.Warn("irc.Channel.AddNick(): trying to add already-present " +
+		logging.Warn("irc.Channel.AddNick(): trying to add already-present "+
 			"nick %s to channel %s", n.Nick, ch.Name)
 	}
 }
@@ -257,7 +257,7 @@ func (n *Nick) AddChannel(ch *Channel) {
 		ch.Nicks[n] = new(ChanPrivs)
 		n.Channels[ch] = ch.Nicks[n]
 	} else {
-		logging.Warn("irc.Nick.AddChannel(): trying to add already-present " +
+		logging.Warn("irc.Nick.AddChannel(): trying to add already-present "+
 			"channel %s to nick %s", ch.Name, n.Nick)
 	}
 }