diff --git a/README.md b/README.md
index f2bd20b..be0096f 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,6 @@ The helper libraries provide the following functionality:
 * Invoke the Sauce REST API to mark a Sauce Job as passed/failed, based on the test result
 * Output the Sauce Session Id to the stdout, so that the Sauce Continuous Integration plugins (for Bamboo/Jenkins/Hudson)
 can parse the output)
-* Provide a com.saucelabs.common.SauceOnDemandAuthentication class, which handles obtaining the Sauce OnDemand user name
-and access key from environment variables and/or the filesystem.
 
 For JUnit projects, the library can be added to a project by including the following dependency:
 
diff --git a/common/src/main/java/com/saucelabs/common/JavaScriptInvokerImpl.java b/common/src/main/java/com/saucelabs/common/JavaScriptInvokerImpl.java
index a50531f..e864a02 100644
--- a/common/src/main/java/com/saucelabs/common/JavaScriptInvokerImpl.java
+++ b/common/src/main/java/com/saucelabs/common/JavaScriptInvokerImpl.java
@@ -6,7 +6,6 @@
 public class JavaScriptInvokerImpl implements JavaScriptExecutor {
     private final WebDriver webDriver;
 
-
     public JavaScriptInvokerImpl(WebDriver driver)
     {
         webDriver = driver;
diff --git a/common/src/main/java/com/saucelabs/common/SauceConfiguration.java b/common/src/main/java/com/saucelabs/common/SauceConfiguration.java
index 5a219d4..fa73c99 100644
--- a/common/src/main/java/com/saucelabs/common/SauceConfiguration.java
+++ b/common/src/main/java/com/saucelabs/common/SauceConfiguration.java
@@ -3,7 +3,7 @@
 public class SauceConfiguration {
     private String userNameEnvironmentVariableKey;
     private String apiKeyEnvironmentVariableName;
-    public String accessKey;
+    private String accessKey;
 
     public SauceConfiguration() {
         userNameEnvironmentVariableKey = "SAUCE_USERNAME";
@@ -40,4 +40,7 @@ public String getEnvironmentVariableApiKeyName() {
         return apiKeyEnvironmentVariableName;
     }
 
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+    }
 }
diff --git a/common/src/main/java/com/saucelabs/common/SauceJavaScriptStrings.java b/common/src/main/java/com/saucelabs/common/SauceJavaScriptStrings.java
index 42b722b..7966e97 100644
--- a/common/src/main/java/com/saucelabs/common/SauceJavaScriptStrings.java
+++ b/common/src/main/java/com/saucelabs/common/SauceJavaScriptStrings.java
@@ -1,10 +1,10 @@
 package com.saucelabs.common;
 
 public class SauceJavaScriptStrings{
-    public static String tagsPrefix = "sauce:job-tags=";
-    public static String sauceContextPrefix = "sauce:context=";
-    public static String testNamePrefix = "sauce:job-name=";
-    public static String buildPrefix = "sauce:job-build=";
-    public static String breakStatement = "sauce: break";
-    public static String testStatusPrefix = "sauce:job-result=";
+    public static final String tagsPrefix = "sauce:job-tags=";
+    public static final String sauceContextPrefix = "sauce:context=";
+    public static final String testNamePrefix = "sauce:job-name=";
+    public static final String buildPrefix = "sauce:job-build=";
+    public static final String breakStatement = "sauce: break";
+    public static final String testStatusPrefix = "sauce:job-result=";
 }