diff --git a/irc/channel.go b/irc/channel.go
index 3308b295..05a96459 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -6,14 +6,14 @@ import (
 )
 
 type Channel struct {
-	flags       ChannelModeSet
-	lists       map[ChannelMode]*UserMaskSet
-	key         Text
-	members     MemberSet
-	name        Name
-	server      *Server
-	topic       Text
-	userLimit   uint64
+	flags     ChannelModeSet
+	lists     map[ChannelMode]*UserMaskSet
+	key       Text
+	members   MemberSet
+	name      Name
+	server    *Server
+	topic     Text
+	userLimit uint64
 }
 
 // NewChannel creates a new channel from a `Server` and a `name`
diff --git a/irc/client.go b/irc/client.go
index f1f87d27..4e076b54 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -13,27 +13,27 @@ const (
 )
 
 type Client struct {
-	atime           time.Time
-	authorized      bool
-	awayMessage     Text
-	capabilities    CapabilitySet
-	capState        CapState
-	channels        ChannelSet
-	commands        chan Command
-	ctime           time.Time
-	flags           map[UserMode]bool
-	hasQuit         bool
-	hops            uint
-	hostname        Name
-	idleTimer       *time.Timer
-	loginTimer      *time.Timer
-	nick            Name
-	quitTimer       *time.Timer
-	realname        Text
-	registered      bool
-	server          *Server
-	socket          *Socket
-	username        Name
+	atime        time.Time
+	authorized   bool
+	awayMessage  Text
+	capabilities CapabilitySet
+	capState     CapState
+	channels     ChannelSet
+	commands     chan Command
+	ctime        time.Time
+	flags        map[UserMode]bool
+	hasQuit      bool
+	hops         uint
+	hostname     Name
+	idleTimer    *time.Timer
+	loginTimer   *time.Timer
+	nick         Name
+	quitTimer    *time.Timer
+	realname     Text
+	registered   bool
+	server       *Server
+	socket       *Socket
+	username     Name
 }
 
 func NewClient(server *Server, conn net.Conn) *Client {
diff --git a/irc/strings.go b/irc/strings.go
index b8cc9227..98304b1b 100644
--- a/irc/strings.go
+++ b/irc/strings.go
@@ -65,7 +65,7 @@ func (text Text) String() string {
 	return string(text)
 }
 
-// CTCPText is text suitable escaped for CTCP.
+// CTCPText is text suitably escaped for CTCP.
 type CTCPText string
 
 var ctcpEscaper = strings.NewReplacer("\x00", "\x200", "\n", "\x20n", "\r", "\x20r")