diff --git a/.travis.yml b/.travis.yml
index 43aa3c9..560f351 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,10 @@ go:
 - tip
 before_install:
 - go get -u -v github.com/mattn/goveralls
+- go get -u -v github.com/golang/lint/golint
 script:
 - $HOME/gopath/bin/goveralls -service=travis-ci -v
+- $HOME/gopath/bin/golint -min_confidence 0.3 | grep -v ALL_CAPS && exit 1
 - go tool vet -v -all .
 branches:
   only:
diff --git a/conn.go b/conn.go
index 98c74a0..bc7a852 100644
--- a/conn.go
+++ b/conn.go
@@ -75,15 +75,15 @@ func newConn(conf Config, addr string) (*ircConn, error) {
 	}
 
 	if conf.Proxy != "" {
-		var proxyUri *url.URL
+		var proxyURI *url.URL
 		var proxyDialer proxy.Dialer
 
-		proxyUri, err = url.Parse(conf.Proxy)
+		proxyURI, err = url.Parse(conf.Proxy)
 		if err != nil {
 			return nil, fmt.Errorf("unable to use proxy %q: %s", conf.Proxy, err)
 		}
 
-		proxyDialer, err = proxy.FromURL(proxyUri, dialer)
+		proxyDialer, err = proxy.FromURL(proxyURI, dialer)
 		if err != nil {
 			return nil, fmt.Errorf("unable to use proxy %q: %s", conf.Proxy, err)
 		}
diff --git a/event.go b/event.go
index 0dc335b..585e47d 100644
--- a/event.go
+++ b/event.go
@@ -97,7 +97,7 @@ func ParseEvent(raw string) (e *Event) {
 	// Find prefix for trailer.
 	i = bytes.Index([]byte(raw[j:]), []byte{eventSpace, messagePrefix})
 	if i != -1 {
-		i += 1
+		i++
 	}
 
 	if i < 0 || raw[j+i-1] != eventSpace {