diff --git a/src/main/java/org/kohsuke/github/GHApp.java b/src/main/java/org/kohsuke/github/GHApp.java
index 312f10949..e1386e72f 100644
--- a/src/main/java/org/kohsuke/github/GHApp.java
+++ b/src/main/java/org/kohsuke/github/GHApp.java
@@ -92,18 +92,18 @@ public class GHApp extends GHObject {
         this.permissions = permissions;
     }
 
-    /* package */ GHApp wrapUp(GitHub root) {
+    GHApp wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
 
     /**
      * Obtains all the installations associated with this app.
-     *
+     * <p>
      * You must use a JWT to access this endpoint.
      *
-     * @see <a href="https://developer.github.com/v3/apps/#list-installations">List installations</a>
      * @return a list of App installations
+     * @see <a href="https://developer.github.com/v3/apps/#list-installations">List installations</a>
      */
     @Preview
     @Deprecated
@@ -113,15 +113,15 @@ public class GHApp extends GHObject {
     }
 
     /**
-     * Obtain an installation associated with this app. You must use a JWT to access this endpoint.
+     * Obtain an installation associated with this app.
+     * <p>
+     * You must use a JWT to access this endpoint.
      *
      * @param id
      *            Installation Id
-     *
      * @return a GHAppInstallation
      * @throws IOException
      *             on error
-     *
      * @see <a href="https://developer.github.com/v3/apps/#get-an-installation">Get an installation</a>
      */
     @Preview
@@ -132,15 +132,15 @@ public class GHApp extends GHObject {
     }
 
     /**
-     * Obtain an organization installation associated with this app. You must use a JWT to access this endpoint.
+     * Obtain an organization installation associated with this app.
+     * <p>
+     * You must use a JWT to access this endpoint.
      *
      * @param name
      *            Organization name
-     *
      * @return a GHAppInstallation
      * @throws IOException
      *             on error
-     *
      * @see <a href="https://developer.github.com/v3/apps/#get-an-organization-installation">Get an organization
      *      installation</a>
      */
@@ -152,17 +152,17 @@ public class GHApp extends GHObject {
     }
 
     /**
-     * Obtain an repository installation associated with this app You must use a JWT to access this endpoint.
+     * Obtain an repository installation associated with this app.
+     * <p>
+     * You must use a JWT to access this endpoint.
      *
      * @param ownerName
      *            Organization or user name
      * @param repositoryName
      *            Repository name
-     *
      * @return a GHAppInstallation
      * @throws IOException
      *             on error
-     *
      * @see <a href="https://developer.github.com/v3/apps/#get-a-repository-installation">Get a repository
      *      installation</a>
      */
@@ -175,15 +175,15 @@ public class GHApp extends GHObject {
     }
 
     /**
-     * Obtain a user installation associated with this app You must use a JWT to access this endpoint.
+     * Obtain a user installation associated with this app.
+     * <p>
+     * You must use a JWT to access this endpoint.
      *
      * @param name
      *            user name
-     *
      * @return a GHAppInstallation
      * @throws IOException
      *             on error
-     *
      * @see <a href="https://developer.github.com/v3/apps/#get-a-user-installation">Get a user installation</a>
      */
     @Preview
diff --git a/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java b/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java
index 8c1ff1b99..e677e634c 100644
--- a/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java
@@ -20,7 +20,7 @@ public class GHAppCreateTokenBuilder {
 
     @Preview
     @Deprecated
-    /* package */ GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
+    GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
         this.root = root;
         this.apiUrlTail = apiUrlTail;
         this.builder = new Requester(root);
diff --git a/src/main/java/org/kohsuke/github/GHAppInstallation.java b/src/main/java/org/kohsuke/github/GHAppInstallation.java
index 1b85dd4c3..96e2633c0 100644
--- a/src/main/java/org/kohsuke/github/GHAppInstallation.java
+++ b/src/main/java/org/kohsuke/github/GHAppInstallation.java
@@ -135,7 +135,7 @@ public class GHAppInstallation extends GHObject {
         this.repositorySelection = repositorySelection;
     }
 
-    /* package */ GHAppInstallation wrapUp(GitHub root) {
+    GHAppInstallation wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHAppInstallationToken.java b/src/main/java/org/kohsuke/github/GHAppInstallationToken.java
index 2f6daca7b..992e7ee34 100644
--- a/src/main/java/org/kohsuke/github/GHAppInstallationToken.java
+++ b/src/main/java/org/kohsuke/github/GHAppInstallationToken.java
@@ -82,7 +82,7 @@ public class GHAppInstallationToken {
         return expires_at;
     }
 
-    /* package */ GHAppInstallationToken wrapUp(GitHub root) {
+    GHAppInstallationToken wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHAuthorization.java b/src/main/java/org/kohsuke/github/GHAuthorization.java
index cf2664f8d..033beda0a 100644
--- a/src/main/java/org/kohsuke/github/GHAuthorization.java
+++ b/src/main/java/org/kohsuke/github/GHAuthorization.java
@@ -98,7 +98,7 @@ public class GHAuthorization extends GHObject {
         return fingerprint;
     }
 
-    /* package */ GHAuthorization wrap(GitHub root) {
+    GHAuthorization wrap(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java
index f25a04357..64c62c9d2 100644
--- a/src/main/java/org/kohsuke/github/GHBranch.java
+++ b/src/main/java/org/kohsuke/github/GHBranch.java
@@ -123,7 +123,7 @@ public class GHBranch {
         return "Branch:" + name + " in " + url;
     }
 
-    /* package */ GHBranch wrap(GHRepository repo) {
+    GHBranch wrap(GHRepository repo) {
         this.owner = repo;
         this.root = repo.root;
         return this;
diff --git a/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java b/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java
index 442d5a0a0..32d1d964a 100644
--- a/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java
@@ -22,7 +22,7 @@ public class GHCommitQueryBuilder {
     private final Requester req;
     private final GHRepository repo;
 
-    /* package */ GHCommitQueryBuilder(GHRepository repo) {
+    GHCommitQueryBuilder(GHRepository repo) {
         this.repo = repo;
         this.req = repo.root.retrieve(); // requester to build up
     }
diff --git a/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java b/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java
index c06ed06da..5d75afbb3 100644
--- a/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 @Preview
 @Deprecated
 public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
-    /* package */ GHCommitSearchBuilder(GitHub root) {
+    GHCommitSearchBuilder(GitHub root) {
         super(root, CommitSearchResult.class);
         req.withPreview(Previews.CLOAK);
     }
@@ -108,7 +108,7 @@ public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
         private GHCommit[] items;
 
         @Override
-        /* package */ GHCommit[] getItems(GitHub root) {
+        GHCommit[] getItems(GitHub root) {
             for (GHCommit commit : items) {
                 String repoName = getRepoName(commit.url);
                 try {
diff --git a/src/main/java/org/kohsuke/github/GHCommitStatus.java b/src/main/java/org/kohsuke/github/GHCommitStatus.java
index b23dbc33b..148a2a17b 100644
--- a/src/main/java/org/kohsuke/github/GHCommitStatus.java
+++ b/src/main/java/org/kohsuke/github/GHCommitStatus.java
@@ -19,7 +19,7 @@ public class GHCommitStatus extends GHObject {
 
     private GitHub root;
 
-    /* package */ GHCommitStatus wrapUp(GitHub root) {
+    GHCommitStatus wrapUp(GitHub root) {
         if (creator != null)
             creator.wrapUp(root);
         this.root = root;
diff --git a/src/main/java/org/kohsuke/github/GHContentSearchBuilder.java b/src/main/java/org/kohsuke/github/GHContentSearchBuilder.java
index ce1f8b00b..f7438d2bb 100644
--- a/src/main/java/org/kohsuke/github/GHContentSearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHContentSearchBuilder.java
@@ -7,7 +7,7 @@ package org.kohsuke.github;
  * @see GitHub#searchContent()
  */
 public class GHContentSearchBuilder extends GHSearchBuilder<GHContent> {
-    /* package */ GHContentSearchBuilder(GitHub root) {
+    GHContentSearchBuilder(GitHub root) {
         super(root, ContentSearchResult.class);
     }
 
@@ -59,7 +59,7 @@ public class GHContentSearchBuilder extends GHSearchBuilder<GHContent> {
         private GHContent[] items;
 
         @Override
-        /* package */ GHContent[] getItems(GitHub root) {
+        GHContent[] getItems(GitHub root) {
             for (GHContent item : items)
                 item.wrap(root);
             return items;
diff --git a/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java b/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java
index 7c14eb545..8c33e9efb 100644
--- a/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java
@@ -13,7 +13,7 @@ public class GHCreateRepositoryBuilder {
     protected final Requester builder;
     private final String apiUrlTail;
 
-    /* package */ GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
+    GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
         this.root = root;
         this.apiUrlTail = apiUrlTail;
         this.builder = new Requester(root);
diff --git a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java
index 422970904..c842c8ddd 100644
--- a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java
@@ -19,7 +19,7 @@ public class GHDeploymentStatusBuilder {
         this(repo, (long) deploymentId, state);
     }
 
-    /* package */ GHDeploymentStatusBuilder(GHRepository repo, long deploymentId, GHDeploymentState state) {
+    GHDeploymentStatusBuilder(GHRepository repo, long deploymentId, GHDeploymentState state) {
         this.repo = repo;
         this.deploymentId = deploymentId;
         this.builder = new Requester(repo.root);
diff --git a/src/main/java/org/kohsuke/github/GHEventInfo.java b/src/main/java/org/kohsuke/github/GHEventInfo.java
index 9f79dd295..4e139c94d 100644
--- a/src/main/java/org/kohsuke/github/GHEventInfo.java
+++ b/src/main/java/org/kohsuke/github/GHEventInfo.java
@@ -51,7 +51,7 @@ public class GHEventInfo {
         return null; // unknown event type
     }
 
-    /* package */ GHEventInfo wrapUp(GitHub root) {
+    GHEventInfo wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHEventPayload.java b/src/main/java/org/kohsuke/github/GHEventPayload.java
index 286a6e91e..01b29c88e 100644
--- a/src/main/java/org/kohsuke/github/GHEventPayload.java
+++ b/src/main/java/org/kohsuke/github/GHEventPayload.java
@@ -19,7 +19,7 @@ public abstract class GHEventPayload {
 
     private GHUser sender;
 
-    /* package */ GHEventPayload() {
+    GHEventPayload() {
     }
 
     /**
@@ -35,7 +35,7 @@ public abstract class GHEventPayload {
         this.sender = sender;
     }
 
-    /* package */ void wrapUp(GitHub root) {
+    void wrapUp(GitHub root) {
         this.root = root;
         if (sender != null) {
             sender.wrapUp(root);
diff --git a/src/main/java/org/kohsuke/github/GHGist.java b/src/main/java/org/kohsuke/github/GHGist.java
index 9784ff1aa..c8681f5c0 100644
--- a/src/main/java/org/kohsuke/github/GHGist.java
+++ b/src/main/java/org/kohsuke/github/GHGist.java
@@ -93,7 +93,7 @@ public class GHGist extends GHObject {
         return Collections.unmodifiableMap(files);
     }
 
-    /* package */ GHGist wrapUp(GHUser owner) {
+    GHGist wrapUp(GHUser owner) {
         this.owner = owner;
         this.root = owner.root;
         wrapUp();
@@ -104,7 +104,7 @@ public class GHGist extends GHObject {
      * Used when caller obtains {@link GHGist} without knowing its owner. A partially constructed owner object is
      * interned.
      */
-    /* package */ GHGist wrapUp(GitHub root) {
+    GHGist wrapUp(GitHub root) {
         this.owner = root.getUser(owner);
         this.root = root;
         wrapUp();
diff --git a/src/main/java/org/kohsuke/github/GHInvitation.java b/src/main/java/org/kohsuke/github/GHInvitation.java
index 3e9a4b3ca..5db4eb428 100644
--- a/src/main/java/org/kohsuke/github/GHInvitation.java
+++ b/src/main/java/org/kohsuke/github/GHInvitation.java
@@ -20,7 +20,7 @@ public class GHInvitation extends GHObject {
     private String permissions;
     private String html_url;
 
-    /* package */ GHInvitation wrapUp(GitHub root) {
+    GHInvitation wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java
index db3d907bd..dfd810237 100644
--- a/src/main/java/org/kohsuke/github/GHIssue.java
+++ b/src/main/java/org/kohsuke/github/GHIssue.java
@@ -79,14 +79,14 @@ public class GHIssue extends GHObject implements Reactable {
     public static class Label extends GHLabel {
     }
 
-    /* package */ GHIssue wrap(GHRepository owner) {
+    GHIssue wrap(GHRepository owner) {
         this.owner = owner;
         if (milestone != null)
             milestone.wrap(owner);
         return wrap(owner.root);
     }
 
-    /* package */ GHIssue wrap(GitHub root) {
+    GHIssue wrap(GitHub root) {
         this.root = root;
         if (assignee != null)
             assignee.wrapUp(root);
@@ -99,7 +99,7 @@ public class GHIssue extends GHObject implements Reactable {
         return this;
     }
 
-    /* package */ static GHIssue[] wrap(GHIssue[] issues, GHRepository owner) {
+    static GHIssue[] wrap(GHIssue[] issues, GHRepository owner) {
         for (GHIssue i : issues)
             i.wrap(owner);
         return issues;
diff --git a/src/main/java/org/kohsuke/github/GHIssueComment.java b/src/main/java/org/kohsuke/github/GHIssueComment.java
index 507b5fc4d..cddc2e02f 100644
--- a/src/main/java/org/kohsuke/github/GHIssueComment.java
+++ b/src/main/java/org/kohsuke/github/GHIssueComment.java
@@ -41,7 +41,7 @@ public class GHIssueComment extends GHObject implements Reactable {
     private String body, gravatar_id, html_url, author_association;
     private GHUser user; // not fully populated. beware.
 
-    /* package */ GHIssueComment wrapUp(GHIssue owner) {
+    GHIssueComment wrapUp(GHIssue owner) {
         this.owner = owner;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHIssueSearchBuilder.java b/src/main/java/org/kohsuke/github/GHIssueSearchBuilder.java
index 1a7db203f..49c58aff3 100644
--- a/src/main/java/org/kohsuke/github/GHIssueSearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHIssueSearchBuilder.java
@@ -7,7 +7,7 @@ package org.kohsuke.github;
  * @see GitHub#searchIssues()
  */
 public class GHIssueSearchBuilder extends GHSearchBuilder<GHIssue> {
-    /* package */ GHIssueSearchBuilder(GitHub root) {
+    GHIssueSearchBuilder(GitHub root) {
         super(root, IssueSearchResult.class);
     }
 
@@ -57,7 +57,7 @@ public class GHIssueSearchBuilder extends GHSearchBuilder<GHIssue> {
         private GHIssue[] items;
 
         @Override
-        /* package */ GHIssue[] getItems(GitHub root) {
+        GHIssue[] getItems(GitHub root) {
             for (GHIssue i : items)
                 i.wrap(root);
             return items;
diff --git a/src/main/java/org/kohsuke/github/GHKey.java b/src/main/java/org/kohsuke/github/GHKey.java
index 88253eed2..8d46b34f6 100644
--- a/src/main/java/org/kohsuke/github/GHKey.java
+++ b/src/main/java/org/kohsuke/github/GHKey.java
@@ -43,7 +43,7 @@ public class GHKey {
         return verified;
     }
 
-    /* package */ GHKey wrap(GitHub root) {
+    GHKey wrap(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHLabel.java b/src/main/java/org/kohsuke/github/GHLabel.java
index 92f896ec2..fd737e3d8 100644
--- a/src/main/java/org/kohsuke/github/GHLabel.java
+++ b/src/main/java/org/kohsuke/github/GHLabel.java
@@ -41,7 +41,7 @@ public class GHLabel {
         return description;
     }
 
-    /* package */ GHLabel wrapUp(GHRepository repo) {
+    GHLabel wrapUp(GHRepository repo) {
         this.repo = repo;
         return this;
     }
@@ -70,7 +70,7 @@ public class GHLabel {
                 .with("description", newDescription).to(url);
     }
 
-    /* package */ static Collection<String> toNames(Collection<GHLabel> labels) {
+    static Collection<String> toNames(Collection<GHLabel> labels) {
         List<String> r = new ArrayList<String>();
         for (GHLabel l : labels) {
             r.add(l.getName());
diff --git a/src/main/java/org/kohsuke/github/GHLicense.java b/src/main/java/org/kohsuke/github/GHLicense.java
index 8eb4a69d3..1cfba97fe 100644
--- a/src/main/java/org/kohsuke/github/GHLicense.java
+++ b/src/main/java/org/kohsuke/github/GHLicense.java
@@ -160,7 +160,7 @@ public class GHLicense extends GHObject {
         return url.hashCode();
     }
 
-    /* package */ GHLicense wrap(GitHub root) {
+    GHLicense wrap(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHMembership.java b/src/main/java/org/kohsuke/github/GHMembership.java
index 5df8f9d44..d5e29ea01 100644
--- a/src/main/java/org/kohsuke/github/GHMembership.java
+++ b/src/main/java/org/kohsuke/github/GHMembership.java
@@ -48,7 +48,7 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
         root.retrieve().method("PATCH").with("state", State.ACTIVE).to(url, this);
     }
 
-    /* package */ GHMembership wrap(GitHub root) {
+    GHMembership wrap(GitHub root) {
         this.root = root;
         if (user != null)
             user = root.getUser(user.wrapUp(root));
@@ -57,7 +57,7 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
         return this;
     }
 
-    /* package */ static void wrap(GHMembership[] page, GitHub root) {
+    static void wrap(GHMembership[] page, GitHub root) {
         for (GHMembership m : page)
             m.wrap(root);
     }
diff --git a/src/main/java/org/kohsuke/github/GHNotificationStream.java b/src/main/java/org/kohsuke/github/GHNotificationStream.java
index 969759ea4..4a8e73319 100644
--- a/src/main/java/org/kohsuke/github/GHNotificationStream.java
+++ b/src/main/java/org/kohsuke/github/GHNotificationStream.java
@@ -31,7 +31,7 @@ public class GHNotificationStream implements Iterable<GHThread> {
     private String apiUrl;
     private boolean nonBlocking = false;
 
-    /* package */ GHNotificationStream(GitHub root, String apiUrl) {
+    GHNotificationStream(GitHub root, String apiUrl) {
         this.root = root;
         this.apiUrl = apiUrl;
     }
diff --git a/src/main/java/org/kohsuke/github/GHObject.java b/src/main/java/org/kohsuke/github/GHObject.java
index 849ecd57b..425116225 100644
--- a/src/main/java/org/kohsuke/github/GHObject.java
+++ b/src/main/java/org/kohsuke/github/GHObject.java
@@ -29,7 +29,7 @@ public abstract class GHObject {
     protected String created_at;
     protected String updated_at;
 
-    /* package */ GHObject() {
+    GHObject() {
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/GHOrgHook.java b/src/main/java/org/kohsuke/github/GHOrgHook.java
index 0afd71303..d13f76640 100644
--- a/src/main/java/org/kohsuke/github/GHOrgHook.java
+++ b/src/main/java/org/kohsuke/github/GHOrgHook.java
@@ -8,9 +8,9 @@ class GHOrgHook extends GHHook {
     /**
      * Organization that the hook belongs to.
      */
-    /* package */ transient GHOrganization organization;
+    transient GHOrganization organization;
 
-    /* package */ GHOrgHook wrap(GHOrganization owner) {
+    GHOrgHook wrap(GHOrganization owner) {
         this.organization = owner;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java
index 7dc7ea164..a2366136d 100644
--- a/src/main/java/org/kohsuke/github/GHOrganization.java
+++ b/src/main/java/org/kohsuke/github/GHOrganization.java
@@ -15,7 +15,7 @@ import static org.kohsuke.github.Previews.INERTIA;
  * @author Kohsuke Kawaguchi
  */
 public class GHOrganization extends GHPerson {
-    /* package */ GHOrganization wrapUp(GitHub root) {
+    GHOrganization wrapUp(GitHub root) {
         return (GHOrganization) super.wrapUp(root);
     }
 
diff --git a/src/main/java/org/kohsuke/github/GHPermission.java b/src/main/java/org/kohsuke/github/GHPermission.java
index cf81c03d5..2f97576e6 100644
--- a/src/main/java/org/kohsuke/github/GHPermission.java
+++ b/src/main/java/org/kohsuke/github/GHPermission.java
@@ -31,7 +31,7 @@ import java.util.Locale;
  * 
  * @see <a href="https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level">API</a>
  */
-/* package */ class GHPermission {
+class GHPermission {
 
     private String permission;
     private GHUser user;
diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
index bbb3a60ac..d93d6f9f4 100644
--- a/src/main/java/org/kohsuke/github/GHPerson.java
+++ b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -27,7 +27,7 @@ public abstract class GHPerson extends GHObject {
     protected String html_url;
     protected int followers, following, public_repos, public_gists;
 
-    /* package */ GHPerson wrapUp(GitHub root) {
+    GHPerson wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestCommitDetail.java b/src/main/java/org/kohsuke/github/GHPullRequestCommitDetail.java
index 4767162ab..cc2311e1d 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestCommitDetail.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestCommitDetail.java
@@ -39,7 +39,7 @@ import java.net.URL;
 public class GHPullRequestCommitDetail {
     private GHPullRequest owner;
 
-    /* package */ void wrapUp(GHPullRequest owner) {
+    void wrapUp(GHPullRequest owner) {
         this.owner = owner;
     }
 
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java b/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java
index dc09ef4c6..10d1bc276 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java
@@ -11,7 +11,7 @@ import static org.kohsuke.github.Previews.SHADOW_CAT;
 public class GHPullRequestQueryBuilder extends GHQueryBuilder<GHPullRequest> {
     private final GHRepository repo;
 
-    /* package */ GHPullRequestQueryBuilder(GHRepository repo) {
+    GHPullRequestQueryBuilder(GHRepository repo) {
         super(repo.root);
         this.repo = repo;
     }
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReview.java b/src/main/java/org/kohsuke/github/GHPullRequestReview.java
index 7896b3fc2..9ea06dd2b 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReview.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReview.java
@@ -46,7 +46,7 @@ public class GHPullRequestReview extends GHObject {
     private GHPullRequestReviewState state;
     private String submitted_at;
 
-    /* package */ GHPullRequestReview wrapUp(GHPullRequest owner) {
+    GHPullRequestReview wrapUp(GHPullRequest owner) {
         this.owner = owner;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java
index 543faba9f..4649d1f1f 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewBuilder.java
@@ -15,7 +15,7 @@ public class GHPullRequestReviewBuilder {
     private final Requester builder;
     private final List<DraftReviewComment> comments = new ArrayList<DraftReviewComment>();
 
-    /* package */ GHPullRequestReviewBuilder(GHPullRequest pr) {
+    GHPullRequestReviewBuilder(GHPullRequest pr) {
         this.pr = pr;
         this.builder = new Requester(pr.root);
     }
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
index 89cb33c70..1804d47e9 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
@@ -57,7 +57,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
         return result;
     }
 
-    /* package */ GHPullRequestReviewComment wrapUp(GHPullRequest owner) {
+    GHPullRequestReviewComment wrapUp(GHPullRequest owner) {
         this.owner = owner;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewEvent.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewEvent.java
index 1bf4c954a..3bcea3311 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReviewEvent.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewEvent.java
@@ -29,14 +29,14 @@ package org.kohsuke.github;
 public enum GHPullRequestReviewEvent {
     PENDING, APPROVE, REQUEST_CHANGES, COMMENT;
 
-    /* package */ String action() {
+    String action() {
         return this == PENDING ? null : name();
     }
 
     /**
      * When a {@link GHPullRequestReview} is submitted with this event, it should transition to this state.
      */
-    /* package */ GHPullRequestReviewState toState() {
+    GHPullRequestReviewState toState() {
         switch (this) {
         case PENDING:
             return GHPullRequestReviewState.PENDING;
diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewState.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewState.java
index f79497bc6..5f1c0c06e 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReviewState.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewState.java
@@ -19,7 +19,7 @@ public enum GHPullRequestReviewState {
         return e == null ? null : e.action();
     }
 
-    /* package */ GHPullRequestReviewEvent toEvent() {
+    GHPullRequestReviewEvent toEvent() {
         switch (this) {
         case PENDING:
             return GHPullRequestReviewEvent.PENDING;
diff --git a/src/main/java/org/kohsuke/github/GHQueryBuilder.java b/src/main/java/org/kohsuke/github/GHQueryBuilder.java
index ac8e87619..bf26fa567 100644
--- a/src/main/java/org/kohsuke/github/GHQueryBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHQueryBuilder.java
@@ -9,7 +9,7 @@ public abstract class GHQueryBuilder<T> {
     protected final GitHub root;
     protected final Requester req;
 
-    /* package */ GHQueryBuilder(GitHub root) {
+    GHQueryBuilder(GitHub root) {
         this.root = root;
         this.req = root.retrieve();
     }
diff --git a/src/main/java/org/kohsuke/github/GHReaction.java b/src/main/java/org/kohsuke/github/GHReaction.java
index 6cb46c03f..e809516ca 100644
--- a/src/main/java/org/kohsuke/github/GHReaction.java
+++ b/src/main/java/org/kohsuke/github/GHReaction.java
@@ -19,7 +19,7 @@ public class GHReaction extends GHObject {
     private GHUser user;
     private ReactionContent content;
 
-    /* package */ GHReaction wrap(GitHub root) {
+    GHReaction wrap(GitHub root) {
         this.root = root;
         user.wrapUp(root);
         return this;
diff --git a/src/main/java/org/kohsuke/github/GHRef.java b/src/main/java/org/kohsuke/github/GHRef.java
index 83d319bbb..f8ff99751 100644
--- a/src/main/java/org/kohsuke/github/GHRef.java
+++ b/src/main/java/org/kohsuke/github/GHRef.java
@@ -66,12 +66,12 @@ public class GHRef {
         new Requester(root).method("DELETE").to(url);
     }
 
-    /* package */ GHRef wrap(GitHub root) {
+    GHRef wrap(GitHub root) {
         this.root = root;
         return this;
     }
 
-    /* package */ static GHRef[] wrap(GHRef[] in, GitHub root) {
+    static GHRef[] wrap(GHRef[] in, GitHub root) {
         for (GHRef r : in) {
             r.wrap(root);
         }
diff --git a/src/main/java/org/kohsuke/github/GHRepoHook.java b/src/main/java/org/kohsuke/github/GHRepoHook.java
index e5990de34..d273168f4 100644
--- a/src/main/java/org/kohsuke/github/GHRepoHook.java
+++ b/src/main/java/org/kohsuke/github/GHRepoHook.java
@@ -4,9 +4,9 @@ class GHRepoHook extends GHHook {
     /**
      * Repository that the hook belongs to.
      */
-    /* package */ transient GHRepository repository;
+    transient GHRepository repository;
 
-    /* package */ GHRepoHook wrap(GHRepository owner) {
+    GHRepoHook wrap(GHRepository owner) {
         this.repository = owner;
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
index 08460cb04..2565c30f8 100644
--- a/src/main/java/org/kohsuke/github/GHRepository.java
+++ b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -1320,7 +1320,7 @@ public class GHRepository extends GHObject {
         }
     };
 
-    /* package */ GHRepository wrap(GitHub root) {
+    GHRepository wrap(GitHub root) {
         this.root = root;
         if (root.isOffline()) {
             owner.wrapUp(root);
diff --git a/src/main/java/org/kohsuke/github/GHRepositoryCloneTraffic.java b/src/main/java/org/kohsuke/github/GHRepositoryCloneTraffic.java
index f8628687b..f7f4f1f7f 100644
--- a/src/main/java/org/kohsuke/github/GHRepositoryCloneTraffic.java
+++ b/src/main/java/org/kohsuke/github/GHRepositoryCloneTraffic.java
@@ -10,10 +10,10 @@ import java.util.List;
 public class GHRepositoryCloneTraffic extends GHRepositoryTraffic {
     private List<DailyInfo> clones;
 
-    /* package */ GHRepositoryCloneTraffic() {
+    GHRepositoryCloneTraffic() {
     }
 
-    /* package */ GHRepositoryCloneTraffic(Integer count, Integer uniques, List<DailyInfo> clones) {
+    GHRepositoryCloneTraffic(Integer count, Integer uniques, List<DailyInfo> clones) {
         super(count, uniques);
         this.clones = clones;
     }
@@ -27,10 +27,10 @@ public class GHRepositoryCloneTraffic extends GHRepositoryTraffic {
     }
 
     public static class DailyInfo extends GHRepositoryTraffic.DailyInfo {
-        /* package */ DailyInfo() {
+        DailyInfo() {
         }
 
-        /* package */ DailyInfo(String timestamp, int count, int uniques) {
+        DailyInfo(String timestamp, int count, int uniques) {
             super(timestamp, count, uniques);
         }
     }
diff --git a/src/main/java/org/kohsuke/github/GHRepositorySearchBuilder.java b/src/main/java/org/kohsuke/github/GHRepositorySearchBuilder.java
index 296007225..c60a610fd 100644
--- a/src/main/java/org/kohsuke/github/GHRepositorySearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHRepositorySearchBuilder.java
@@ -7,7 +7,7 @@ package org.kohsuke.github;
  * @see GitHub#searchRepositories()
  */
 public class GHRepositorySearchBuilder extends GHSearchBuilder<GHRepository> {
-    /* package */ GHRepositorySearchBuilder(GitHub root) {
+    GHRepositorySearchBuilder(GitHub root) {
         super(root, RepositorySearchResult.class);
     }
 
@@ -77,7 +77,7 @@ public class GHRepositorySearchBuilder extends GHSearchBuilder<GHRepository> {
         private GHRepository[] items;
 
         @Override
-        /* package */ GHRepository[] getItems(GitHub root) {
+        GHRepository[] getItems(GitHub root) {
             for (GHRepository item : items)
                 item.wrap(root);
             return items;
diff --git a/src/main/java/org/kohsuke/github/GHRepositoryStatistics.java b/src/main/java/org/kohsuke/github/GHRepositoryStatistics.java
index f925a63c9..2371dacf8 100644
--- a/src/main/java/org/kohsuke/github/GHRepositoryStatistics.java
+++ b/src/main/java/org/kohsuke/github/GHRepositoryStatistics.java
@@ -178,7 +178,7 @@ public class GHRepositoryStatistics {
             }
         }
 
-        /* package */ ContributorStats wrapUp(GitHub root) {
+        ContributorStats wrapUp(GitHub root) {
             this.root = root;
             return this;
         }
@@ -222,7 +222,7 @@ public class GHRepositoryStatistics {
             return week;
         }
 
-        /* package */ CommitActivity wrapUp(GitHub root) {
+        CommitActivity wrapUp(GitHub root) {
             this.root = root;
             return this;
         }
@@ -345,7 +345,7 @@ public class GHRepositoryStatistics {
             return owner;
         }
 
-        /* package */ Participation wrapUp(GitHub root) {
+        Participation wrapUp(GitHub root) {
             this.root = root;
             return this;
         }
diff --git a/src/main/java/org/kohsuke/github/GHRepositoryTraffic.java b/src/main/java/org/kohsuke/github/GHRepositoryTraffic.java
index 198e66033..8efb74083 100644
--- a/src/main/java/org/kohsuke/github/GHRepositoryTraffic.java
+++ b/src/main/java/org/kohsuke/github/GHRepositoryTraffic.java
@@ -7,10 +7,10 @@ public abstract class GHRepositoryTraffic implements TrafficInfo {
     private int count;
     private int uniques;
 
-    /* package */ GHRepositoryTraffic() {
+    GHRepositoryTraffic() {
     }
 
-    /* package */ GHRepositoryTraffic(int count, int uniques) {
+    GHRepositoryTraffic(int count, int uniques) {
         this.count = count;
         this.uniques = uniques;
     }
@@ -42,10 +42,10 @@ public abstract class GHRepositoryTraffic implements TrafficInfo {
             return uniques;
         }
 
-        /* package */ DailyInfo() {
+        DailyInfo() {
         }
 
-        /* package */ DailyInfo(String timestamp, Integer count, Integer uniques) {
+        DailyInfo(String timestamp, Integer count, Integer uniques) {
             this.timestamp = timestamp;
             this.count = count;
             this.uniques = uniques;
diff --git a/src/main/java/org/kohsuke/github/GHRepositoryViewTraffic.java b/src/main/java/org/kohsuke/github/GHRepositoryViewTraffic.java
index 452bfc594..1f897baf4 100644
--- a/src/main/java/org/kohsuke/github/GHRepositoryViewTraffic.java
+++ b/src/main/java/org/kohsuke/github/GHRepositoryViewTraffic.java
@@ -10,10 +10,10 @@ import java.util.List;
 public class GHRepositoryViewTraffic extends GHRepositoryTraffic {
     private List<DailyInfo> views;
 
-    /* package */ GHRepositoryViewTraffic() {
+    GHRepositoryViewTraffic() {
     }
 
-    /* package */ GHRepositoryViewTraffic(int count, int uniques, List<DailyInfo> views) {
+    GHRepositoryViewTraffic(int count, int uniques, List<DailyInfo> views) {
         super(count, uniques);
         this.views = views;
     }
@@ -27,10 +27,10 @@ public class GHRepositoryViewTraffic extends GHRepositoryTraffic {
     }
 
     public static class DailyInfo extends GHRepositoryTraffic.DailyInfo {
-        /* package */ DailyInfo() {
+        DailyInfo() {
         }
 
-        /* package */ DailyInfo(String timestamp, int count, int uniques) {
+        DailyInfo(String timestamp, int count, int uniques) {
             super(timestamp, count, uniques);
         }
     }
diff --git a/src/main/java/org/kohsuke/github/GHSearchBuilder.java b/src/main/java/org/kohsuke/github/GHSearchBuilder.java
index a872bf191..17a035b2a 100644
--- a/src/main/java/org/kohsuke/github/GHSearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHSearchBuilder.java
@@ -18,7 +18,7 @@ public abstract class GHSearchBuilder<T> extends GHQueryBuilder<T> {
      */
     private final Class<? extends SearchResult<T>> receiverType;
 
-    /* package */ GHSearchBuilder(GitHub root, Class<? extends SearchResult<T>> receiverType) {
+    GHSearchBuilder(GitHub root, Class<? extends SearchResult<T>> receiverType) {
         super(root);
         this.receiverType = receiverType;
     }
diff --git a/src/main/java/org/kohsuke/github/GHTag.java b/src/main/java/org/kohsuke/github/GHTag.java
index 72eba8f95..2f5703107 100644
--- a/src/main/java/org/kohsuke/github/GHTag.java
+++ b/src/main/java/org/kohsuke/github/GHTag.java
@@ -16,7 +16,7 @@ public class GHTag {
     private String name;
     private GHCommit commit;
 
-    /* package */ GHTag wrap(GHRepository owner) {
+    GHTag wrap(GHRepository owner) {
         this.owner = owner;
         this.root = owner.root;
         if (commit != null)
diff --git a/src/main/java/org/kohsuke/github/GHTagObject.java b/src/main/java/org/kohsuke/github/GHTagObject.java
index db42f7797..cafe4ceac 100644
--- a/src/main/java/org/kohsuke/github/GHTagObject.java
+++ b/src/main/java/org/kohsuke/github/GHTagObject.java
@@ -20,7 +20,7 @@ public class GHTagObject {
     private GitUser tagger;
     private GHRef.GHObject object;
 
-    /* package */ GHTagObject wrap(GHRepository owner) {
+    GHTagObject wrap(GHRepository owner) {
         this.owner = owner;
         this.root = owner.root;
         return this;
diff --git a/src/main/java/org/kohsuke/github/GHTeam.java b/src/main/java/org/kohsuke/github/GHTeam.java
index 2c4382d38..49e66a6d5 100644
--- a/src/main/java/org/kohsuke/github/GHTeam.java
+++ b/src/main/java/org/kohsuke/github/GHTeam.java
@@ -31,25 +31,25 @@ public class GHTeam implements Refreshable {
         MAINTAINER
     }
 
-    /* package */ GHTeam wrapUp(GHOrganization owner) {
+    GHTeam wrapUp(GHOrganization owner) {
         this.organization = owner;
         this.root = owner.root;
         return this;
     }
 
-    /* package */ GHTeam wrapUp(GitHub root) { // auto-wrapUp when organization is known from GET /user/teams
+    GHTeam wrapUp(GitHub root) { // auto-wrapUp when organization is known from GET /user/teams
         this.organization.wrapUp(root);
         return wrapUp(organization);
     }
 
-    /* package */ static GHTeam[] wrapUp(GHTeam[] teams, GHOrganization owner) {
+    static GHTeam[] wrapUp(GHTeam[] teams, GHOrganization owner) {
         for (GHTeam t : teams) {
             t.wrapUp(owner);
         }
         return teams;
     }
 
-    /* package */ static GHTeam[] wrapUp(GHTeam[] teams, GHPullRequest owner) {
+    static GHTeam[] wrapUp(GHTeam[] teams, GHPullRequest owner) {
         for (GHTeam t : teams) {
             t.root = owner.root;
         }
diff --git a/src/main/java/org/kohsuke/github/GHThread.java b/src/main/java/org/kohsuke/github/GHThread.java
index 1d94dfd8e..1375d6680 100644
--- a/src/main/java/org/kohsuke/github/GHThread.java
+++ b/src/main/java/org/kohsuke/github/GHThread.java
@@ -109,7 +109,7 @@ public class GHThread extends GHObject {
         return repository.getCommit(subject.url.substring(subject.url.lastIndexOf('/') + 1));
     }
 
-    /* package */ GHThread wrap(GitHub root) {
+    GHThread wrap(GitHub root) {
         this.root = root;
         if (this.repository != null)
             this.repository.wrap(root);
diff --git a/src/main/java/org/kohsuke/github/GHTree.java b/src/main/java/org/kohsuke/github/GHTree.java
index 78a11a15e..7981d55f7 100644
--- a/src/main/java/org/kohsuke/github/GHTree.java
+++ b/src/main/java/org/kohsuke/github/GHTree.java
@@ -64,7 +64,7 @@ public class GHTree {
         return GitHub.parseURL(url);
     }
 
-    /* package */GHTree wrap(GHRepository repo) {
+    GHTree wrap(GHRepository repo) {
         this.repo = repo;
         for (GHTreeEntry e : tree) {
             e.tree = this;
diff --git a/src/main/java/org/kohsuke/github/GHUser.java b/src/main/java/org/kohsuke/github/GHUser.java
index 1090642f9..7e46c096f 100644
--- a/src/main/java/org/kohsuke/github/GHUser.java
+++ b/src/main/java/org/kohsuke/github/GHUser.java
@@ -128,7 +128,7 @@ public class GHUser extends GHPerson {
         return org.hasPublicMember(this);
     }
 
-    /* package */ static GHUser[] wrap(GHUser[] users, GitHub root) {
+    static GHUser[] wrap(GHUser[] users, GitHub root) {
         for (GHUser f : users)
             f.root = root;
         return users;
@@ -184,7 +184,7 @@ public class GHUser extends GHPerson {
         return "/users/" + login + tail;
     }
 
-    /* package */ GHUser wrapUp(GitHub root) {
+    GHUser wrapUp(GitHub root) {
         super.wrapUp(root);
         return this;
     }
diff --git a/src/main/java/org/kohsuke/github/GHUserSearchBuilder.java b/src/main/java/org/kohsuke/github/GHUserSearchBuilder.java
index 15c4aab20..c2c2d61ee 100644
--- a/src/main/java/org/kohsuke/github/GHUserSearchBuilder.java
+++ b/src/main/java/org/kohsuke/github/GHUserSearchBuilder.java
@@ -7,7 +7,7 @@ package org.kohsuke.github;
  * @see GitHub#searchUsers()
  */
 public class GHUserSearchBuilder extends GHSearchBuilder<GHUser> {
-    /* package */ GHUserSearchBuilder(GitHub root) {
+    GHUserSearchBuilder(GitHub root) {
         super(root, UserSearchResult.class);
     }
 
@@ -65,7 +65,7 @@ public class GHUserSearchBuilder extends GHSearchBuilder<GHUser> {
         private GHUser[] items;
 
         @Override
-        /* package */ GHUser[] getItems(GitHub root) {
+        GHUser[] getItems(GitHub root) {
             return GHUser.wrap(items, root);
         }
     }
diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java
index dc3debcfc..e1bd982d4 100644
--- a/src/main/java/org/kohsuke/github/GitHub.java
+++ b/src/main/java/org/kohsuke/github/GitHub.java
@@ -67,12 +67,12 @@ import static org.kohsuke.github.Previews.MACHINE_MAN;
  * @author Kohsuke Kawaguchi
  */
 public class GitHub {
-    /* package */ final String login;
+    final String login;
 
     /**
      * Value of the authorization header to be sent with the request.
      */
-    /* package */ final String encodedAuthorization;
+    final String encodedAuthorization;
 
     private final ConcurrentMap<String, GHUser> users;
     private final ConcurrentMap<String, GHOrganization> orgs;
@@ -80,8 +80,8 @@ public class GitHub {
     private GHMyself myself;
     private final String apiUrl;
 
-    /* package */ final RateLimitHandler rateLimitHandler;
-    /* package */ final AbuseLimitHandler abuseLimitHandler;
+    final RateLimitHandler rateLimitHandler;
+    final AbuseLimitHandler abuseLimitHandler;
 
     private HttpConnector connector = HttpConnector.DEFAULT;
 
@@ -130,7 +130,7 @@ public class GitHub {
      * @param connector
      *            HttpConnector to use. Pass null to use default connector.
      */
-    /* package */ GitHub(String apiUrl, String login, String oauthAccessToken, String jwtToken, String password,
+    GitHub(String apiUrl, String login, String oauthAccessToken, String jwtToken, String password,
             HttpConnector connector, RateLimitHandler rateLimitHandler, AbuseLimitHandler abuseLimitHandler)
             throws IOException {
         if (apiUrl.endsWith("/"))
@@ -297,13 +297,13 @@ public class GitHub {
         this.connector = connector;
     }
 
-    /* package */ void requireCredential() {
+    void requireCredential() {
         if (isAnonymous())
             throw new IllegalStateException(
                     "This operation requires a credential but none is given to the GitHub constructor");
     }
 
-    /* package */ URL getApiURL(String tailApiUrl) throws IOException {
+    URL getApiURL(String tailApiUrl) throws IOException {
         if (tailApiUrl.startsWith("/")) {
             if ("github.com".equals(apiUrl)) {// backward compatibility
                 return new URL(GITHUB_URL + tailApiUrl);
@@ -315,7 +315,7 @@ public class GitHub {
         }
     }
 
-    /* package */ Requester retrieve() {
+    Requester retrieve() {
         return new Requester(this).method("GET");
     }
 
@@ -802,7 +802,7 @@ public class GitHub {
         }
     }
 
-    /* package */ GHUser intern(GHUser user) throws IOException {
+    GHUser intern(GHUser user) throws IOException {
         if (user == null)
             return user;
 
@@ -988,7 +988,7 @@ public class GitHub {
                 .contentType("text/plain;charset=UTF-8").asStream("/markdown/raw"), "UTF-8");
     }
 
-    /* package */ static URL parseURL(String s) {
+    static URL parseURL(String s) {
         try {
             return s == null ? null : new URL(s);
         } catch (MalformedURLException e) {
@@ -996,7 +996,7 @@ public class GitHub {
         }
     }
 
-    /* package */ static Date parseDate(String timestamp) {
+    static Date parseDate(String timestamp) {
         if (timestamp == null)
             return null;
         for (String f : TIME_FORMATS) {
@@ -1011,13 +1011,13 @@ public class GitHub {
         throw new IllegalStateException("Unable to parse the timestamp: " + timestamp);
     }
 
-    /* package */ static String printDate(Date dt) {
+    static String printDate(Date dt) {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
         df.setTimeZone(TimeZone.getTimeZone("GMT"));
         return df.format(dt);
     }
 
-    /* package */ static final ObjectMapper MAPPER = new ObjectMapper();
+    static final ObjectMapper MAPPER = new ObjectMapper();
 
     private static final String[] TIME_FORMATS = { "yyyy/MM/dd HH:mm:ss ZZZZ", "yyyy-MM-dd'T'HH:mm:ss'Z'",
             "yyyy-MM-dd'T'HH:mm:ss.S'Z'" // GitHub App endpoints return a different date format
@@ -1029,7 +1029,7 @@ public class GitHub {
         MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true);
     }
 
-    /* package */ static final String GITHUB_URL = "https://api.github.com";
+    static final String GITHUB_URL = "https://api.github.com";
 
     private static final Logger LOGGER = Logger.getLogger(GitHub.class.getName());
 }
diff --git a/src/main/java/org/kohsuke/github/PagedIterator.java b/src/main/java/org/kohsuke/github/PagedIterator.java
index 7c8f520dd..28b2360b3 100644
--- a/src/main/java/org/kohsuke/github/PagedIterator.java
+++ b/src/main/java/org/kohsuke/github/PagedIterator.java
@@ -22,7 +22,7 @@ public abstract class PagedIterator<T> implements Iterator<T> {
     private T[] current;
     private int pos;
 
-    /* package */ PagedIterator(Iterator<T[]> base) {
+    PagedIterator(Iterator<T[]> base) {
         this.base = base;
     }
 
diff --git a/src/main/java/org/kohsuke/github/PagedSearchIterable.java b/src/main/java/org/kohsuke/github/PagedSearchIterable.java
index 65a9cab17..974cf4676 100644
--- a/src/main/java/org/kohsuke/github/PagedSearchIterable.java
+++ b/src/main/java/org/kohsuke/github/PagedSearchIterable.java
@@ -19,7 +19,7 @@ public abstract class PagedSearchIterable<T> extends PagedIterable<T> {
      */
     private SearchResult<T> result;
 
-    /* package */ PagedSearchIterable(GitHub root) {
+    PagedSearchIterable(GitHub root) {
         this.root = root;
     }
 
diff --git a/src/main/java/org/kohsuke/github/Previews.java b/src/main/java/org/kohsuke/github/Previews.java
index 809e69ecf..2468ac94c 100644
--- a/src/main/java/org/kohsuke/github/Previews.java
+++ b/src/main/java/org/kohsuke/github/Previews.java
@@ -7,7 +7,7 @@ package org.kohsuke.github;
  *
  * @author Kohsuke Kawaguchi
  */
-/* package */ class Previews {
+class Previews {
 
     /**
      * Commit Search
diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java
index f14d6681a..5513345ff 100644
--- a/src/main/java/org/kohsuke/github/Requester.java
+++ b/src/main/java/org/kohsuke/github/Requester.java
@@ -117,7 +117,7 @@ class Requester {
         return this;
     }
 
-    /* package */ Requester withPreview(String name) {
+    Requester withPreview(String name) {
         return withHeader("Accept", name);
     }
 
@@ -232,7 +232,7 @@ class Requester {
      * Normally whether parameters go as query parameters or a body depends on the HTTP verb in use, but this method
      * forces the parameters to be sent as a body.
      */
-    /* package */ Requester inBody() {
+    Requester inBody() {
         forceBody = true;
         return this;
     }
@@ -443,7 +443,7 @@ class Requester {
         return forceBody || !METHODS_WITHOUT_BODY.contains(method);
     }
 
-    /* package */ <T> PagedIterable<T> asPagedIterable(String tailApiUrl, Class<T[]> type, Consumer<T> consumer) {
+    <T> PagedIterable<T> asPagedIterable(String tailApiUrl, Class<T[]> type, Consumer<T> consumer) {
         return new PagedIterableWithConsumer(type, this, tailApiUrl, consumer);
     }
 
@@ -483,7 +483,7 @@ class Requester {
      *
      * Every iterator call reports a new batch.
      */
-    /* package */ <T> Iterator<T> asIterator(String tailApiUrl, Class<T> type, int pageSize) {
+    <T> Iterator<T> asIterator(String tailApiUrl, Class<T> type, int pageSize) {
         method("GET");
 
         if (pageSize != 0)
@@ -742,7 +742,7 @@ class Requester {
     /**
      * Handle API error by either throwing it or by returning normally to retry.
      */
-    /* package */ void handleApiError(IOException e) throws IOException {
+    void handleApiError(IOException e) throws IOException {
         int responseCode;
         try {
             responseCode = uc.getResponseCode();
diff --git a/src/main/java/org/kohsuke/github/SearchResult.java b/src/main/java/org/kohsuke/github/SearchResult.java
index 28aa44fd4..e3b86a9e9 100644
--- a/src/main/java/org/kohsuke/github/SearchResult.java
+++ b/src/main/java/org/kohsuke/github/SearchResult.java
@@ -17,5 +17,5 @@ abstract class SearchResult<T> {
     /**
      * Wraps up the retrieved object and return them. Only called once.
      */
-    /* package */ abstract T[] getItems(GitHub root);
+    abstract T[] getItems(GitHub root);
 }