diff --git a/src/model/build-parameters.test.ts b/src/model/build-parameters.test.ts
index c4ab5659..5b3075c0 100644
--- a/src/model/build-parameters.test.ts
+++ b/src/model/build-parameters.test.ts
@@ -5,16 +5,15 @@ import BuildParameters from './build-parameters';
 import Input from './input';
 import Platform from './platform';
 
+// Todo - Don't use process.env directly, that's what the input model class is for.
 const testLicense =
   '<?xml version="1.0" encoding="UTF-8"?><root>\n    <License id="Terms">\n        <MachineBindings>\n            <Binding Key="1" Value="576562626572264761624c65526f7578"/>\n            <Binding Key="2" Value="576562626572264761624c65526f7578"/>\n        </MachineBindings>\n        <MachineID Value="D7nTUnjNAmtsUMcnoyrqkgIbYdM="/>\n        <SerialHash Value="2033b8ac3e6faa3742ca9f0bfae44d18f2a96b80"/>\n        <Features>\n            <Feature Value="33"/>\n            <Feature Value="1"/>\n            <Feature Value="12"/>\n            <Feature Value="2"/>\n            <Feature Value="24"/>\n            <Feature Value="3"/>\n            <Feature Value="36"/>\n            <Feature Value="17"/>\n            <Feature Value="19"/>\n            <Feature Value="62"/>\n        </Features>\n        <DeveloperData Value="AQAAAEY0LUJHUlgtWEQ0RS1aQ1dWLUM1SlctR0RIQg=="/>\n        <SerialMasked Value="F4-BGRX-XD4E-ZCWV-C5JW-XXXX"/>\n        <StartDate Value="2021-02-08T00:00:00"/>\n        <UpdateDate Value="2021-02-09T00:34:57"/>\n        <InitialActivationDate Value="2021-02-08T00:34:56"/>\n        <LicenseVersion Value="6.x"/>\n        <ClientProvidedVersion Value="2018.4.30f1"/>\n        <AlwaysOnline Value="false"/>\n        <Entitlements>\n            <Entitlement Ns="unity_editor" Tag="UnityPersonal" Type="EDITOR" ValidTo="9999-12-31T00:00:00"/>\n            <Entitlement Ns="unity_editor" Tag="DarkSkin" Type="EDITOR_FEATURE" ValidTo="9999-12-31T00:00:00"/>\n        </Entitlements>\n    </License>\n<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><Reference URI="#Terms"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><DigestValue>m0Db8UK+ktnOLJBtHybkfetpcKo=</DigestValue></Reference></SignedInfo><SignatureValue>o/pUbSQAukz7+ZYAWhnA0AJbIlyyCPL7bKVEM2lVqbrXt7cyey+umkCXamuOgsWPVUKBMkXtMH8L\n5etLmD0getWIhTGhzOnDCk+gtIPfL4jMo9tkEuOCROQAXCci23VFscKcrkB+3X6h4wEOtA2APhOY\nB+wvC794o8/82ffjP79aVAi57rp3Wmzx+9pe9yMwoJuljAy2sc2tIMgdQGWVmOGBpQm3JqsidyzI\nJWG2kjnc7pDXK9pwYzXoKiqUqqrut90d+kQqRyv7MSZXR50HFqD/LI69h68b7P8Bjo3bPXOhNXGR\n9YCoemH6EkfCJxp2gIjzjWW+l2Hj2EsFQi8YXw==</SignatureValue></Signature></root>';
 process.env.UNITY_LICENSE = testLicense;
 
 const determineVersion = jest.spyOn(Versioning, 'determineVersion').mockImplementation(async () => '1.3.37');
-
 const determineUnityVersion = jest
   .spyOn(UnityVersioning, 'determineUnityVersion')
   .mockImplementation(() => '2019.2.11f1');
-
 const determineSdkManagerParameters = jest
   .spyOn(AndroidVersioning, 'determineSdkManagerParameters')
   .mockImplementation(() => 'platforms;android-30');
diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts
index be4770b4..17b650a9 100644
--- a/src/model/build-parameters.ts
+++ b/src/model/build-parameters.ts
@@ -55,15 +55,13 @@ class BuildParameters {
 
   static async create(): Promise<BuildParameters> {
     const buildFile = this.parseBuildFile(Input.buildName, Input.targetPlatform, Input.androidAppBundle);
-
     const unityVersion = UnityVersioning.determineUnityVersion(Input.projectPath, Input.unityVersion);
-
     const buildVersion = await Versioning.determineVersion(Input.versioningStrategy, Input.specifiedVersion);
-
     const androidVersionCode = AndroidVersioning.determineVersionCode(buildVersion, Input.androidVersionCode);
-
     const androidSdkManagerParameters = AndroidVersioning.determineSdkManagerParameters(Input.androidTargetSdkVersion);
 
+    // Todo - Don't use process.env directly, that's what the input model class is for.
+    // ---
     let unitySerial = '';
     if (!process.env.UNITY_SERIAL) {
       //No serial was present so it is a personal license that we need to convert
@@ -78,6 +76,7 @@ class BuildParameters {
       unitySerial = process.env.UNITY_SERIAL!;
     }
     core.setSecret(unitySerial);
+    // ---
 
     return {
       version: unityVersion,
diff --git a/src/model/input.ts b/src/model/input.ts
index 105c5e60..cee2ec47 100644
--- a/src/model/input.ts
+++ b/src/model/input.ts
@@ -147,7 +147,7 @@ class Input {
   }
 
   static get androidTargetSdkVersion() {
-    return core.getInput('androidTargetSdkVersion') || '';
+    return Input.getInput('androidTargetSdkVersion') || '';
   }
 
   static get sshAgent() {
@@ -155,7 +155,7 @@ class Input {
   }
 
   static async gitPrivateToken() {
-    return core.getInput('gitPrivateToken') || (await Input.githubToken());
+    return Input.getInput('gitPrivateToken') || (await Input.githubToken());
   }
 
   static get chownFilesTo() {