diff --git a/Storage/Storage/Internal/Utilities/AVUserExtensions.cs b/Storage/Storage/Internal/Utilities/AVUserExtensions.cs
deleted file mode 100644
index 936dc37..0000000
--- a/Storage/Storage/Internal/Utilities/AVUserExtensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace LeanCloud.Storage.Internal
-{
-    /// <summary>
-    /// So here's the deal. We have a lot of internal APIs for AVObject, AVUser, etc.
-    ///
-    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
-    /// they are no longer a part of the same library, especially as we create things like
-    /// Installation inside push library.
-    ///
-    /// So this class contains a bunch of extension methods that can live inside another
-    /// namespace, which 'wrap' the intenral APIs that already exist.
-    /// </summary>
-    public static class AVUserExtensions
-    {
-
-    }
-}
diff --git a/Storage/Storage/Public/AVFile.cs b/Storage/Storage/Public/AVFile.cs
index b359119..204ba21 100644
--- a/Storage/Storage/Public/AVFile.cs
+++ b/Storage/Storage/Public/AVFile.cs
@@ -23,7 +23,7 @@ namespace LeanCloud {
     /// await obj.SaveAsync();
     /// </code>
     /// </example>
-    public partial class AVFile : IJsonConvertible {
+    public class AVFile : IJsonConvertible {
         internal static int objectCounter = 0;
         internal static readonly object Mutex = new object();
         private FileState state;
@@ -45,7 +45,7 @@ namespace LeanCloud {
                 MimeType = mimeType,
                 MetaData = metaData
             };
-            this.dataStream = data;
+            dataStream = data;
             lock (Mutex) {
                 objectCounter++;
                 state.counter = objectCounter;
@@ -132,7 +132,7 @@ namespace LeanCloud {
                 objectCounter++;
                 state.counter = objectCounter;
             }
-            this.isExternal = true;
+            isExternal = true;
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace LeanCloud {
         }
 
         internal AVFile(FileState filestate) {
-            this.state = filestate;
+            state = filestate;
         }
         internal AVFile(string objectId)
             : this(new FileState() {
@@ -258,7 +258,7 @@ namespace LeanCloud {
         #endregion
 
         IDictionary<string, object> IJsonConvertible.ToJSON() {
-            if (this.IsDirty) {
+            if (IsDirty) {
                 throw new InvalidOperationException(
                   "AVFile must be saved before it can be serialized.");
             }
@@ -292,14 +292,14 @@ namespace LeanCloud {
         internal Task SaveExternal() {
             Dictionary<string, object> strs = new Dictionary<string, object>()
             {
-                { "url", this.Url.ToString() },
-                { "name",this.Name },
-                { "mime_type",this.MimeType},
-                { "metaData",this.MetaData}
+                { "url", Url.ToString() },
+                { "name", Name },
+                { "mime_type", MimeType},
+                { "metaData", MetaData}
             };
             AVCommand cmd = null;
 
-            if (!string.IsNullOrEmpty(this.ObjectId)) {
+            if (!string.IsNullOrEmpty(ObjectId)) {
                 cmd = new AVCommand {
                     Path = $"files/{ObjectId}",
                     Method = HttpMethod.Put,
@@ -331,7 +331,7 @@ namespace LeanCloud {
         public string ObjectId {
             get {
                 string str;
-                lock (this.mutex) {
+                lock (mutex) {
                     str = state.ObjectId;
                 }
                 return str;
@@ -359,8 +359,7 @@ namespace LeanCloud {
         }
 
         static AVFile() {
-            Dictionary<string, string> strs = new Dictionary<string, string>()
-            {
+            Dictionary<string, string> strs = new Dictionary<string, string> {
                 { "ai", "application/postscript" },
                 { "aif", "audio/x-aiff" },
                 { "aifc", "audio/x-aiff" },
@@ -550,15 +549,15 @@ namespace LeanCloud {
                 { "xyz", "chemical/x-xyz" },
                 { "zip", "application/zip" },
             };
-            AVFile.MIMETypesDictionary = strs;
+            MIMETypesDictionary = strs;
         }
         internal static string GetMIMEType(string fileName) {
             try {
                 string str = Path.GetExtension(fileName).Remove(0, 1);
-                if (!AVFile.MIMETypesDictionary.ContainsKey(str)) {
+                if (!MIMETypesDictionary.ContainsKey(str)) {
                     return "unknown/unknown";
                 }
-                return AVFile.MIMETypesDictionary[str];
+                return MIMETypesDictionary[str];
             } catch {
                 return "unknown/unknown";
             }
@@ -585,11 +584,12 @@ namespace LeanCloud {
         }
 
         public static AVFile CreateWithData(string objectId, string name, string url, IDictionary<string, object> metaData) {
-            var fileState = new FileState();
-            fileState.Name = name;
-            fileState.ObjectId = objectId;
-            fileState.Url = new Uri(url);
-            fileState.MetaData = metaData;
+            var fileState = new FileState {
+                Name = name,
+                ObjectId = objectId,
+                Url = new Uri(url),
+                MetaData = metaData
+            };
             return CreateWithState(fileState);
         }
         /// <summary>
@@ -602,7 +602,7 @@ namespace LeanCloud {
         }
 
         internal void MergeFromJSON(IDictionary<string, object> jsonData) {
-            lock (this.mutex) {
+            lock (mutex) {
                 state.ObjectId = jsonData["objectId"] as string;
                 state.Url = new Uri(jsonData["url"] as string, UriKind.Absolute);
                 if (jsonData.ContainsKey("name")) {
diff --git a/Storage/Storage/Public/AVObject.cs b/Storage/Storage/Public/AVObject.cs
index 05e77b2..fa31756 100644
--- a/Storage/Storage/Public/AVObject.cs
+++ b/Storage/Storage/Public/AVObject.cs
@@ -4,8 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Net;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,19 +11,8 @@ using System.Collections;
 
 namespace LeanCloud {
     /// <summary>
-    /// The AVObject is a local representation of data that can be saved and
-    /// retrieved from the LeanCloud cloud.</summary>
-    /// <remarks>
-    /// <para>
-    /// The basic workflow for creating new data is to construct a new AVObject,
-    /// use the indexer to fill it with data, and then use SaveAsync() to persist to the
-    /// database.
-    /// </para>
-    /// <para>
-    /// The basic workflow for accessing existing data is to use a AVQuery
-    /// to specify which existing data to retrieve.
-    /// </para>
-    /// </remarks>
+    /// AVObject
+    /// </summary>
     public class AVObject : IEnumerable<KeyValuePair<string, object>>, INotifyPropertyChanged, INotifyPropertyUpdated, INotifyCollectionPropertyUpdated {
         private static readonly string AutoClassName = "_Automatic";
 
@@ -615,7 +602,7 @@ string propertyName
             var saveDirtyFileTasks = DeepTraversal(obj, true)
                 .OfType<AVFile>()
                 .Where(f => f.IsDirty)
-                .Select(f => f.SaveAsync(cancellationToken)).ToList();
+                .Select(f => f.SaveAsync(cancellationToken: cancellationToken)).ToList();
 
             return Task.WhenAll(saveDirtyFileTasks).OnSuccess(_ => {
                 IEnumerable<AVObject> remaining = new List<AVObject>(uniqueObjects);
@@ -740,7 +727,7 @@ string propertyName
         /// <returns>The list passed in for convenience.</returns>
         public static Task<IEnumerable<T>> FetchAllIfNeededAsync<T>(
             IEnumerable<T> objects, CancellationToken cancellationToken) where T : AVObject {
-            return AVObject.EnqueueForAll(objects.Cast<AVObject>(), (Task toAwait) => {
+            return EnqueueForAll(objects.Cast<AVObject>(), (Task toAwait) => {
                 return FetchAllInternalAsync(objects, false, toAwait, cancellationToken);
             }, cancellationToken);
         }
@@ -763,7 +750,7 @@ string propertyName
         /// <returns>The list passed in for convenience.</returns>
         public static Task<IEnumerable<T>> FetchAllAsync<T>(
             IEnumerable<T> objects, CancellationToken cancellationToken) where T : AVObject {
-            return AVObject.EnqueueForAll(objects.Cast<AVObject>(), (Task toAwait) => {
+            return EnqueueForAll(objects.Cast<AVObject>(), (Task toAwait) => {
                 return FetchAllInternalAsync(objects, true, toAwait, cancellationToken);
             }, cancellationToken);
         }
@@ -872,7 +859,7 @@ string propertyName
             var uniqueObjects = new HashSet<AVObject>(objects.OfType<AVObject>().ToList(),
               new IdentityEqualityComparer<AVObject>());
 
-            return AVObject.EnqueueForAll<object>(uniqueObjects, toAwait => {
+            return EnqueueForAll<object>(uniqueObjects, toAwait => {
                 var states = uniqueObjects.Select(t => t.state).ToList();
                 return toAwait.OnSuccess(_ => {
                     var deleteTasks = ObjectController.DeleteAllAsync(states, cancellationToken);