diff --git a/MvvmHelpers/BaseViewModel.cs b/MvvmHelpers/BaseViewModel.cs
index 532ebee..48540a0 100644
--- a/MvvmHelpers/BaseViewModel.cs
+++ b/MvvmHelpers/BaseViewModel.cs
@@ -13,8 +13,8 @@ public class BaseViewModel : ObservableObject
         /// <value>The title.</value>
         public string Title
         {
-            get { return title; }
-            set { SetProperty(ref title, value); }
+            get => title;
+            set => SetProperty(ref title, value);
         }
 
         string subtitle = string.Empty;
@@ -25,8 +25,8 @@ public string Title
         /// <value>The subtitle.</value>
         public string Subtitle
         {
-            get { return subtitle; }
-            set { SetProperty(ref subtitle, value); }
+            get => subtitle;
+            set => SetProperty(ref subtitle, value);
         }
 
         string icon = string.Empty;
@@ -37,8 +37,8 @@ public string Subtitle
         /// <value>The icon.</value>
         public string Icon
         {
-            get { return icon; }
-            set { SetProperty(ref icon, value); }
+            get => icon;
+            set => SetProperty(ref icon, value);
         }
 
         bool isBusy;
@@ -49,7 +49,7 @@ public string Icon
         /// <value><c>true</c> if this instance is busy; otherwise, <c>false</c>.</value>
         public bool IsBusy
         {
-            get { return isBusy; }
+            get => isBusy;
             set 
             { 
                 if (SetProperty(ref isBusy, value))
@@ -65,7 +65,7 @@ public bool IsBusy
         /// <value><c>true</c> if this instance is not busy; otherwise, <c>false</c>.</value>
         public bool IsNotBusy
         {
-            get { return isNotBusy; }
+            get => isNotBusy;
             set 
             { 
                 if(SetProperty(ref isNotBusy, value))
@@ -81,8 +81,8 @@ public bool IsNotBusy
        /// <value><c>true</c> if this instance can load more; otherwise, <c>false</c>.</value>
         public bool CanLoadMore
         {
-            get { return canLoadMore; }
-            set { SetProperty(ref canLoadMore, value); }
+            get => canLoadMore;
+            set => SetProperty(ref canLoadMore, value);
         }
 
 
@@ -94,8 +94,8 @@ public bool CanLoadMore
         /// <value>The header.</value>
         public string Header
         {
-            get { return header; }
-            set { SetProperty(ref header, value); }
+            get => header;
+            set => SetProperty(ref header, value);
         }
 
         string footer = string.Empty;
@@ -106,8 +106,8 @@ public string Header
         /// <value>The footer.</value>
         public string Footer
         {
-            get { return footer; }
-            set { SetProperty(ref footer, value); }
+            get => footer;
+            set => SetProperty(ref footer, value);
         }
     }
 }
diff --git a/MvvmHelpers/Grouping.cs b/MvvmHelpers/Grouping.cs
index 2120314..1e34d30 100644
--- a/MvvmHelpers/Grouping.cs
+++ b/MvvmHelpers/Grouping.cs
@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MvvmHelpers
 {
@@ -12,7 +11,7 @@ public class Grouping<TKey, TItem> : ObservableRangeCollection<TItem>
         /// Gets the key.
         /// </summary>
         /// <value>The key.</value>
-        public TKey Key { get; private set; }
+        public TKey Key { get; }
 
         /// <summary>
         /// Returns list of items in the grouping.
@@ -41,12 +40,12 @@ public class Grouping<TKey, TSubKey, TItem> : ObservableRangeCollection<TItem>
         /// Gets the key.
         /// </summary>
         /// <value>The key.</value>
-        public TKey Key { get; private set; }
+        public TKey Key { get; }
 
         /// <summary>
         /// Gets the subkey of the grouping
         /// </summary>
-        public TSubKey SubKey { get; private set; }
+        public TSubKey SubKey { get; }
 
         /// <summary>
         /// Returns list of items in the grouping.
diff --git a/MvvmHelpers/ObservableObject.cs b/MvvmHelpers/ObservableObject.cs
index 324f541..25075ce 100644
--- a/MvvmHelpers/ObservableObject.cs
+++ b/MvvmHelpers/ObservableObject.cs
@@ -19,7 +19,7 @@ public class ObservableObject : INotifyPropertyChanged
         /// <param name="propertyName">Property name.</param>
         /// <param name="onChanged">On changed.</param>
         /// <typeparam name="T">The 1st type parameter.</typeparam>
-        protected bool SetProperty<T>(
+        protected virtual bool SetProperty<T>(
             ref T backingStore, T value,
             [CallerMemberName]string propertyName = "",
             Action onChanged = null)
diff --git a/MvvmHelpers/ObservableRangeCollection.cs b/MvvmHelpers/ObservableRangeCollection.cs
index 5932363..7fbd31b 100644
--- a/MvvmHelpers/ObservableRangeCollection.cs
+++ b/MvvmHelpers/ObservableRangeCollection.cs
@@ -38,18 +38,16 @@ public ObservableRangeCollection(IEnumerable<T> collection)
         public void AddRange(IEnumerable<T> collection, NotifyCollectionChangedAction notificationMode = NotifyCollectionChangedAction.Add)
         {
             if (notificationMode != NotifyCollectionChangedAction.Add && notificationMode != NotifyCollectionChangedAction.Reset)
-                throw new ArgumentException("Mode must be either Add or Reset for AddRange.", "notificationMode");
+                throw new ArgumentException("Mode must be either Add or Reset for AddRange.", nameof(notificationMode));
             if (collection == null)
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
 
             CheckReentrancy();
 
             if (notificationMode == NotifyCollectionChangedAction.Reset)
             {
                 foreach (var i in collection)
-                {
                     Items.Add(i);
-                }
 
                 OnPropertyChanged(new PropertyChangedEventArgs("Count"));
                 OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
@@ -61,9 +59,7 @@ public void AddRange(IEnumerable<T> collection, NotifyCollectionChangedAction no
             int startIndex = Count;
             var changedItems = collection is List<T> ? (List<T>)collection : new List<T>(collection);
             foreach (var i in changedItems)
-            {
                 Items.Add(i);
-            }
 
             OnPropertyChanged(new PropertyChangedEventArgs("Count"));
             OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
@@ -76,9 +72,9 @@ public void AddRange(IEnumerable<T> collection, NotifyCollectionChangedAction no
         public void RemoveRange(IEnumerable<T> collection, NotifyCollectionChangedAction notificationMode = NotifyCollectionChangedAction.Reset)
         {
             if (notificationMode != NotifyCollectionChangedAction.Remove && notificationMode != NotifyCollectionChangedAction.Reset)
-                throw new ArgumentException("Mode must be either Remove or Reset for RemoveRange.", "notificationMode");
+                throw new ArgumentException("Mode must be either Remove or Reset for RemoveRange.", nameof(notificationMode));
             if (collection == null)
-                throw new ArgumentNullException("collection");
+                throw new ArgumentNullException(nameof(collection));
 
             CheckReentrancy();
 
@@ -87,6 +83,7 @@ public void RemoveRange(IEnumerable<T> collection, NotifyCollectionChangedAction
 
                 foreach (var i in collection)
                     Items.Remove(i);
+
                 OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 
                 return;
@@ -110,10 +107,7 @@ public void RemoveRange(IEnumerable<T> collection, NotifyCollectionChangedAction
         /// <summary> 
         /// Clears the current collection and replaces it with the specified item. 
         /// </summary> 
-        public void Replace(T item)
-        {
-            ReplaceRange(new T[] { item });
-        }
+        public void Replace(T item) => ReplaceRange(new T[] { item });
 
         /// <summary> 
         /// Clears the current collection and replaces it with the specified collection. 
diff --git a/MvvmHelpers/Utils.cs b/MvvmHelpers/Utils.cs
index c387451..8cddd04 100644
--- a/MvvmHelpers/Utils.cs
+++ b/MvvmHelpers/Utils.cs
@@ -20,10 +20,7 @@ public async static Task<T> WithTimeout<T>(this Task<T> task, int timeoutInMilli
             var retTask = await Task.WhenAny(task, Task.Delay(timeoutInMilliseconds))
                 .ConfigureAwait(false);
 
-            if (retTask is Task<T>) 
-                return task.Result;
-            
-            return default(T);
+            return retTask is Task<T> ? task.Result : default(T);
         }
 
         /// <summary>
diff --git a/README.md b/README.md
index 8b377ae..0f8f885 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 Collection of MVVM helper classes for any application.
 
-
 Grab the NuGet: https://www.nuget.org/packages/Refractored.MvvmHelpers
 
 Build Status: [![Build status](https://ci.appveyor.com/api/projects/status/nsj9rae1g93hy62o/branch/master?svg=true)](https://ci.appveyor.com/project/JamesMontemagno/mvvm-helpers/branch/master)