diff --git a/pom.xml b/pom.xml
index f5e4055..6a5b0e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
             <scope>provided</scope>
         </dependency>
         <!--
-        Jersey benyttes her til all integrasjon
+        Jersey is used for all integration
         -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -21,7 +21,7 @@
             <version>2.25</version>
         </dependency>
         <!--
-        Legger til støtte for å bruke oauth2 som autentiseringsmekanisme (access_token)
+        Add support for oauth2 as authentication mecanism (access_token)
         -->
         <dependency>
             <groupId>org.glassfish.jersey.security</groupId>
@@ -29,7 +29,7 @@
             <version>2.25</version>
         </dependency>
         <!--
-        Benyttes til parsing av json
+        Used for parsing of json
         -->
         <dependency>
             <groupId>org.json</groupId>
@@ -37,7 +37,7 @@
             <version>20160810</version>
         </dependency>
         <!--
-        Støtte for behandling av jwt
+        Support for jwt
         -->
         <dependency>
             <groupId>com.nimbusds</groupId>
diff --git a/src/main/java/no/bankid/oidc/BankIdOIDCClient.java b/src/main/java/no/bankid/oidc/BankIdOIDCClient.java
index 69eac4d..ba36a16 100644
--- a/src/main/java/no/bankid/oidc/BankIdOIDCClient.java
+++ b/src/main/java/no/bankid/oidc/BankIdOIDCClient.java
@@ -23,8 +23,8 @@
 
 public class BankIdOIDCClient {
 
-    public static final String CONFIG_URL = "https://prototype.bankidnorge.no/bankid-oauth/oauth/.well-known/openid-configuration";
-    public static final String CALLBACK_URL = "http://localhost:8080/callback";
+    private static final String CONFIG_URL = "https://prototype.bankidnorge.no/bankid-oauth/oauth/.well-known/openid-configuration";
+    private static final String CALLBACK_URL = "http://localhost:8080/callback";
 
     private final String authorizationEndpoint;
     private final String token_endpoint;
@@ -68,7 +68,7 @@ public String createAuthenticationUrl() {
                 authorizationEndpoint, CLIENT_ID, encoded(CALLBACK_URL), encoded(state), "somecorrelationnonce");
     }
 
-    public static String encoded(String s) {
+    private static String encoded(String s) {
         try {
             return encode(s, Charset.forName("UTF-8").name());
         } catch (UnsupportedEncodingException e) {
diff --git a/src/main/java/no/bankid/oidc/ClientDefinition.java b/src/main/java/no/bankid/oidc/ClientDefinition.java
index 7c6093a..6d0b15b 100644
--- a/src/main/java/no/bankid/oidc/ClientDefinition.java
+++ b/src/main/java/no/bankid/oidc/ClientDefinition.java
@@ -1,6 +1,6 @@
 package no.bankid.oidc;
 
-public class ClientDefinition {
+class ClientDefinition {
 
     /**
      * Client_id and password must be inseted here for the appliction to work.
diff --git a/src/main/java/no/bankid/oidc/JWTHandler.java b/src/main/java/no/bankid/oidc/JWTHandler.java
index 6886d0a..1c9135e 100644
--- a/src/main/java/no/bankid/oidc/JWTHandler.java
+++ b/src/main/java/no/bankid/oidc/JWTHandler.java
@@ -13,7 +13,7 @@
 import java.text.ParseException;
 import java.util.List;
 
-public class JWTHandler {
+class JWTHandler {
 
     private final JWKSet publicKeys;
 
diff --git a/src/main/java/no/bankid/oidc/web/WelcomeServlet.java b/src/main/java/no/bankid/oidc/web/WelcomeServlet.java
index aadbf4f..9d4c863 100644
--- a/src/main/java/no/bankid/oidc/web/WelcomeServlet.java
+++ b/src/main/java/no/bankid/oidc/web/WelcomeServlet.java
@@ -17,7 +17,7 @@ public class WelcomeServlet extends HttpServlet {
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws IOException {
 
-        /**
+        /*
          * Tries to find the user on the session. If no user can be found, a login link is presented.
          *
          * After login the user will be redirected back to this servlet with the user on the session.