diff --git a/src/Microsoft.Azure.EventHubs.Processor/AzureStorageCheckpointLeaseManager.cs b/src/Microsoft.Azure.EventHubs.Processor/AzureStorageCheckpointLeaseManager.cs
old mode 100644
new mode 100755
index 045b14c..f782d8d
--- a/src/Microsoft.Azure.EventHubs.Processor/AzureStorageCheckpointLeaseManager.cs
+++ b/src/Microsoft.Azure.EventHubs.Processor/AzureStorageCheckpointLeaseManager.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Azure.EventHubs.Processor.Options;
+
 namespace Microsoft.Azure.EventHubs.Processor
 {
     using System;
@@ -257,7 +259,7 @@ public async Task<Lease> CreateLeaseIfNotExistsAsync(string partitionId) // thro
     	    {
                 CloudBlockBlob leaseBlob = GetBlockBlobReference(partitionId);
                 returnLease = new AzureBlobLease(partitionId, leaseBlob);
-                string jsonLease = JsonConvert.SerializeObject(returnLease);
+                string jsonLease = JsonConvert.SerializeObject(returnLease, JsonConvertOptions.GetOptions());
 
                 ProcessorEventSource.Log.AzureStorageManagerInfo(
                     this.host.Id,
@@ -338,7 +340,7 @@ async Task<bool> AcquireLeaseCoreAsync(AzureBlobLease lease)
                 lease.Token = newToken;
                 lease.Owner = this.host.HostName;
                 lease.IncrementEpoch(); // Increment epoch each time lease is acquired or stolen by a new host
-                await leaseBlob.UploadTextAsync(JsonConvert.SerializeObject(lease), null, AccessCondition.GenerateLeaseCondition(lease.Token), null, null).ConfigureAwait(false);
+                await leaseBlob.UploadTextAsync(JsonConvert.SerializeObject(lease, JsonConvertOptions.GetOptions()), null, AccessCondition.GenerateLeaseCondition(lease.Token), null, null).ConfigureAwait(false);
             }
     	    catch (StorageException se)
             {
@@ -390,7 +392,7 @@ async Task<bool> ReleaseLeaseCoreAsync(AzureBlobLease lease)
                     Token = string.Empty,
                     Owner = string.Empty
                 };
-                await leaseBlob.UploadTextAsync(JsonConvert.SerializeObject(releasedCopy), null, AccessCondition.GenerateLeaseCondition(leaseId), null, null).ConfigureAwait(false);
+                await leaseBlob.UploadTextAsync(JsonConvert.SerializeObject(releasedCopy, JsonConvertOptions.GetOptions()), null, AccessCondition.GenerateLeaseCondition(leaseId), null, null).ConfigureAwait(false);
                 await leaseBlob.ReleaseLeaseAsync(AccessCondition.GenerateLeaseCondition(leaseId)).ConfigureAwait(false);
             }
     	    catch (StorageException se)
@@ -428,7 +430,7 @@ async Task<bool> UpdateLeaseCoreAsync(AzureBlobLease lease)
             CloudBlockBlob leaseBlob = lease.Blob;
     	    try
             {
-                string jsonToUpload = JsonConvert.SerializeObject(lease);
+                string jsonToUpload = JsonConvert.SerializeObject(lease, JsonConvertOptions.GetOptions());
                 ProcessorEventSource.Log.AzureStorageManagerInfo(this.host.Id, lease.PartitionId, $"Raw JSON uploading: {jsonToUpload}");
                 await leaseBlob.UploadTextAsync(jsonToUpload, null, AccessCondition.GenerateLeaseCondition(token), null, null).ConfigureAwait(false);
             }
@@ -445,7 +447,7 @@ async Task<AzureBlobLease> DownloadLeaseAsync(string partitionId, CloudBlockBlob
             string jsonLease = await blob.DownloadTextAsync().ConfigureAwait(false);
 
             ProcessorEventSource.Log.AzureStorageManagerInfo(this.host.Id, partitionId, "Raw JSON downloaded: " + jsonLease);
-            AzureBlobLease rehydrated = (AzureBlobLease)JsonConvert.DeserializeObject(jsonLease, typeof(AzureBlobLease));
+            AzureBlobLease rehydrated = (AzureBlobLease)JsonConvert.DeserializeObject(jsonLease, typeof(AzureBlobLease), JsonConvertOptions.GetOptions());
     	    AzureBlobLease blobLease = new AzureBlobLease(rehydrated, blob);
     	    return blobLease;
         }
diff --git a/src/Microsoft.Azure.EventHubs.Processor/Microsoft.Azure.EventHubs.Processor.csproj b/src/Microsoft.Azure.EventHubs.Processor/Microsoft.Azure.EventHubs.Processor.csproj
old mode 100644
new mode 100755
index 605b42e..3524777
--- a/src/Microsoft.Azure.EventHubs.Processor/Microsoft.Azure.EventHubs.Processor.csproj
+++ b/src/Microsoft.Azure.EventHubs.Processor/Microsoft.Azure.EventHubs.Processor.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <Description>This is the next generation Azure Event Hubs .NET Standard Event Processor Host library. For more information about Event Hubs, see https://azure.microsoft.com/en-us/services/event-hubs/</Description>
     <AssemblyTitle>Microsoft.Azure.EventHubs.Processor</AssemblyTitle>
     <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Microsoft</Authors>
-    <TargetFrameworks>net461;netstandard2.0;uap10.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>Microsoft.Azure.EventHubs.Processor</AssemblyName>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>
@@ -27,32 +26,25 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Azure.EventHubs\Microsoft.Azure.EventHubs.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.2.3" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.Azure.EventHubs.Processor/Options/JsonConvertOptions.cs b/src/Microsoft.Azure.EventHubs.Processor/Options/JsonConvertOptions.cs
new file mode 100644
index 0000000..04d32b1
--- /dev/null
+++ b/src/Microsoft.Azure.EventHubs.Processor/Options/JsonConvertOptions.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Microsoft.Azure.EventHubs.Processor.Options
+{
+    /// <summary>
+    /// JsonConvert Options
+    /// </summary>
+    public static class JsonConvertOptions
+    {
+        /// <summary>
+        /// Get the JsonConvert formatting options. so it's not conflicting / dependent upon the user's code.
+        /// </summary>
+        /// <returns></returns>
+        public static JsonSerializerSettings GetOptions()
+        {
+            return new JsonSerializerSettings
+            {
+                Formatting = Formatting.Indented,
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                NullValueHandling = NullValueHandling.Ignore
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj b/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
old mode 100644
new mode 100755
index d54f33b..adb01e7
--- a/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
+++ b/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>Microsoft.Azure.EventHubs</AssemblyTitle>
     <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Microsoft</Authors>
-    <TargetFrameworks>net461;netstandard2.0;uap10.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>Microsoft.Azure.EventHubs</AssemblyName>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>