diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2216db7..812e19e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -75,8 +75,8 @@ the [GitHub API documentation][] is organized, so use that as your guide for
 where to put new methods.
 
 Sub-service (e.g. [Repo Hooks][]) implementations are split into separate files
-based on the APIs they provide. These files are named service_api.go (e.g. 
-repos_hooks.go) to describe the API to service mappings. 
+based on the APIs they provide. These files are named service_api.go (e.g.
+repos_hooks.go) to describe the API to service mappings.
 
 [GitHub API documentation]: http://developer.github.com/v3/
 [Repo Hooks]: http://developer.github.com/v3/repos/hooks/
diff --git a/github/activity.go b/github/activity.go
index a8456ae..355de62 100644
--- a/github/activity.go
+++ b/github/activity.go
@@ -8,7 +8,7 @@ package github
 // ActivityService handles communication with the activity related
 // methods of the GitHub API.
 //
-// GitHub API docs: http://developer.github.com/v3/users/
+// GitHub API docs: http://developer.github.com/v3/activity/
 type ActivityService struct {
 	client *Client
 }
diff --git a/github/activity_events_test.go b/github/activity_events_test.go
index 63badf6..54fa59f 100644
--- a/github/activity_events_test.go
+++ b/github/activity_events_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 )
 
-func TestEventsService_ListEventsPerformedByUser_all(t *testing.T) {
+func TestActivityService_ListEventsPerformedByUser_all(t *testing.T) {
 	setup()
 	defer teardown()
 
diff --git a/github/users.go b/github/users.go
index 63fce80..3f272d1 100644
--- a/github/users.go
+++ b/github/users.go
@@ -39,9 +39,6 @@ type User struct {
 	CreatedAt   *time.Time `json:"created_at,omitempty"`
 }
 
-// UserEmail represents user's email address
-type UserEmail string
-
 // Get fetches a user.  Passing the empty string will fetch the authenticated
 // user.
 //
diff --git a/github/users_emails.go b/github/users_emails.go
index aa5de1a..bb67a9b 100644
--- a/github/users_emails.go
+++ b/github/users_emails.go
@@ -5,6 +5,9 @@
 
 package github
 
+// UserEmail represents user's email address
+type UserEmail string
+
 // ListEmails lists all authenticated user email addresses
 //
 // GitHub API docs: http://developer.github.com/v3/users/emails/#list-email-addresses-for-a-user