diff --git a/bot/bot.go b/bot/bot.go
index 215c577..afa31e0 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -70,7 +70,7 @@ func (l *Logger) Run() {
 	}
 }
 
-// User type stores user history. This is a vehicle that will follow the user for the active 
+// User type stores user history. This is a vehicle that will follow the user for the active
 // session
 type User struct {
 	// Current nickname known
diff --git a/plugins/beers.go b/plugins/beers.go
index d1e8c8e..238a6d2 100644
--- a/plugins/beers.go
+++ b/plugins/beers.go
@@ -121,7 +121,7 @@ func (p *BeersPlugin) Message(message bot.Message) bool {
 		// no matter what, if we're in here, then we've responded
 		return true
 	} else if parts[0] == "beers--" {
-		p.setBeers(user, p.getBeers(user)-1)
+		p.setBeers(nick, p.getBeers(nick)-1)
 		p.Bot.SendAction(channel, "flushes")
 		return true
 	} else if parts[0] == "beers++" {
diff --git a/plugins/factoid.go b/plugins/factoid.go
index 95b1412..8488bc1 100644
--- a/plugins/factoid.go
+++ b/plugins/factoid.go
@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-// The factoid plugin provides a learning system to the bot so that it can 
+// The factoid plugin provides a learning system to the bot so that it can
 // respond to queries in a way that is unpredictable and fun
 
 // factoid stores info about our factoid for lookup and later interaction