diff --git a/src/Skybrud.LinkPicker/Extensions/PublishedContentExtensions.cs b/src/Skybrud.LinkPicker/Extensions/PublishedContentExtensions.cs
index 65adfaa..1209f47 100644
--- a/src/Skybrud.LinkPicker/Extensions/PublishedContentExtensions.cs
+++ b/src/Skybrud.LinkPicker/Extensions/PublishedContentExtensions.cs
@@ -22,7 +22,7 @@ public static class PublishedContentExtensions {
         /// <returns>An instance of <see cref="LinkPickerItem"/>.</returns>
         public static LinkPickerItem GetLinkPickerItem(this IPublishedContent content, string propertyAlias) {
             LinkPickerList list = content.GetPropertyValue(propertyAlias) as LinkPickerList;
-            LinkPickerItem item = (list == null ? null : list.Items.FirstOrDefault());
+            LinkPickerItem item = list?.Items.FirstOrDefault();
             return item ?? new LinkPickerItem();
         }
 
@@ -37,7 +37,7 @@ public static LinkPickerItem GetLinkPickerItem(this IPublishedContent content, s
         /// <param name="propertyAlias">The alias of the property.</param>
         /// <returns>An instance of <see cref="LinkPickerList"/>.</returns>
         public static LinkPickerList GetLinkPickerList(this IPublishedContent content, string propertyAlias) {
-            return (content == null ? null : content.GetPropertyValue<LinkPickerList>(propertyAlias)) ?? new LinkPickerList {
+            return content?.GetPropertyValue<LinkPickerList>(propertyAlias) ?? new LinkPickerList {
                 Items = new LinkPickerItem[0]
             };
         }
diff --git a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfig.cs b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfig.cs
index 4c6c6cf..6c98582 100644
--- a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfig.cs
+++ b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfig.cs
@@ -12,15 +12,15 @@ public class GridEditorLinkPickerConfig : GridEditorConfigBase {
 
         #region Properties
 
-        public GridEditorLinkPickerConfigTitle Title { get; private set; }
+        public GridEditorLinkPickerConfigTitle Title { get; }
 
-        public int Limit { get; private set; }
+        public int Limit { get; }
 
-        public GridEditorLinkPickerConfigTypes Types { get; private set; }
+        public GridEditorLinkPickerConfigTypes Types { get; }
 
-        public bool ShowTable { get; private set; }
+        public bool ShowTable { get; }
 
-        public GridEditorLinkPickerConfigColumns Columns { get; private set; }
+        public GridEditorLinkPickerConfigColumns Columns { get; }
 
 
         #endregion
diff --git a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigColumns.cs b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigColumns.cs
index b514fcb..81e4bf2 100644
--- a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigColumns.cs
+++ b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigColumns.cs
@@ -11,15 +11,15 @@ public class GridEditorLinkPickerConfigColumns : GridJsonObject {
 
         #region Properties
 
-        public bool Type { get; private set; }
+        public bool Type { get; }
 
-        public bool Id { get; private set; }
+        public bool Id { get; }
 
-        public bool Name { get; private set; }
+        public bool Name { get; }
 
-        public bool Url { get; private set; }
+        public bool Url { get; }
 
-        public bool Target { get; private set; }
+        public bool Target { get; }
 
         #endregion
 
diff --git a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTitle.cs b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTitle.cs
index 0d633a2..53c3e4d 100644
--- a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTitle.cs
+++ b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTitle.cs
@@ -15,31 +15,27 @@ public class GridEditorLinkPickerConfigTitle : GridJsonObject {
         /// <summary>
         /// Gets whether the title of the link picker list should be shown.
         /// </summary>
-        public bool Show { get; private set; }
+        public bool Show { get; }
 
         /// <summary>
         /// Gets the placeholder title of the link picker.
         /// </summary>
-        public string Placeholder { get; private set; }
+        public string Placeholder { get; }
 
         /// <summary>
         /// Gets whether the <see cref="Placeholder"/> property has a value.
         /// </summary>
-        public bool HasPlaceholder {
-            get { return !String.IsNullOrWhiteSpace(Placeholder); }
-        }
+        public bool HasPlaceholder => !String.IsNullOrWhiteSpace(Placeholder);
 
         /// <summary>
         /// Gets the default (fallback) title of the link picker.
         /// </summary>
-        public string Default { get; private set; }
+        public string Default { get; }
 
         /// <summary>
         /// Gets whether the <see cref="Default"/> property has a value.
         /// </summary>
-        public bool HasDefault {
-            get { return !String.IsNullOrWhiteSpace(Default); }
-        }
+        public bool HasDefault => !String.IsNullOrWhiteSpace(Default);
 
         #endregion
 
diff --git a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTypes.cs b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTypes.cs
index f8e01a1..5732259 100644
--- a/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTypes.cs
+++ b/src/Skybrud.LinkPicker/Grid/Config/GridEditorLinkPickerConfigTypes.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using Skybrud.Essentials.Json.Extensions;
 using Skybrud.Umbraco.GridData.Json;
 
@@ -12,11 +11,11 @@ public class GridEditorLinkPickerConfigTypes : GridJsonObject {
 
         #region Properties
 
-        public bool Url { get; private set; }
+        public bool Url { get; }
 
-        public bool Content { get; private set; }
+        public bool Content { get; }
 
-        public bool Media { get; private set; }
+        public bool Media { get; }
 
         #endregion
 
diff --git a/src/Skybrud.LinkPicker/Grid/Values/GridControlLinkPickerValue.cs b/src/Skybrud.LinkPicker/Grid/Values/GridControlLinkPickerValue.cs
index 65dc9f6..bcf5dda 100644
--- a/src/Skybrud.LinkPicker/Grid/Values/GridControlLinkPickerValue.cs
+++ b/src/Skybrud.LinkPicker/Grid/Values/GridControlLinkPickerValue.cs
@@ -13,15 +13,13 @@ public class GridControlLinkPickerValue : LinkPickerList, IGridControlValue {
         /// <summary>
         /// Gets a reference to the parent control.
         /// </summary>
-        public GridControl Control { get; private set; }
+        public GridControl Control { get; }
 
         /// <summary>
         /// Gets whether the link picker list is valid (alias of <see cref="LinkPickerList.HasItems"/>).
         /// </summary>
         [JsonIgnore]
-        public override bool IsValid {
-            get { return HasItems; }
-        }
+        public override bool IsValid => HasItems;
 
         #endregion
 
diff --git a/src/Skybrud.LinkPicker/Json/Converters/LinkPickerConverter.cs b/src/Skybrud.LinkPicker/Json/Converters/LinkPickerConverter.cs
index 863f38d..6a1e39e 100644
--- a/src/Skybrud.LinkPicker/Json/Converters/LinkPickerConverter.cs
+++ b/src/Skybrud.LinkPicker/Json/Converters/LinkPickerConverter.cs
@@ -9,9 +9,7 @@ namespace Skybrud.LinkPicker.Json.Converters {
     /// </summary>
     public class LinkPickerConverter : JsonConverter {
 
-        public override bool CanWrite {
-            get { return false; }
-        }
+        public override bool CanWrite => false;
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) {
 
diff --git a/src/Skybrud.LinkPicker/Json/Converters/LinkPickerItemConverter.cs b/src/Skybrud.LinkPicker/Json/Converters/LinkPickerItemConverter.cs
index 74398ee..2afab82 100644
--- a/src/Skybrud.LinkPicker/Json/Converters/LinkPickerItemConverter.cs
+++ b/src/Skybrud.LinkPicker/Json/Converters/LinkPickerItemConverter.cs
@@ -7,7 +7,7 @@ namespace Skybrud.LinkPicker.Json.Converters {
     /// <summary>
     /// JSON converter specifically for serializing and deserializing instances of <see cref="LinkPickerItem" />. This
     /// converter differs from <see cref="LinkPickerConverter" /> as this converter will serialize an invalid
-    /// <see cref="LinkPickerItem" /> to <code>null</code>.
+    /// <see cref="LinkPickerItem" /> to <c>null</c>.
     /// </summary>
     public class LinkPickerItemConverter : JsonConverter {
         
@@ -53,7 +53,7 @@ private object ReadJsonObject(JsonReader reader, Type objectType) {
         /// Determines whether this instance can convert the specified <paramref name="objectType"/>.
         /// </summary>
         /// <param name="objectType">Type of the object.</param>
-        /// <returns><code>true</code> if this instance can convert the specified object type; otherwise <code>false</code>.</returns>
+        /// <returns><c>true</c> if this instance can convert the specified object type; otherwise <c>false</c>.</returns>
         public override bool CanConvert(Type objectType){
             return objectType == typeof(LinkPickerItem);
         }
diff --git a/src/Skybrud.LinkPicker/LinkPickerItem.cs b/src/Skybrud.LinkPicker/LinkPickerItem.cs
index 6fef062..474c316 100644
--- a/src/Skybrud.LinkPicker/LinkPickerItem.cs
+++ b/src/Skybrud.LinkPicker/LinkPickerItem.cs
@@ -25,7 +25,7 @@ public class LinkPickerItem {
         public JObject JObject { get; private set; }
 
         /// <summary>
-        /// Gets the ID of the selected content or media. If an URL has been selected, this will return <code>0</code>.
+        /// Gets the ID of the selected content or media. If an URL has been selected, this will return <c>0</c>.
         /// </summary>
         [JsonProperty("id")]
         public int Id { get; private set; }
diff --git a/src/Skybrud.LinkPicker/LinkPickerList.cs b/src/Skybrud.LinkPicker/LinkPickerList.cs
index 3be6250..fe234c6 100644
--- a/src/Skybrud.LinkPicker/LinkPickerList.cs
+++ b/src/Skybrud.LinkPicker/LinkPickerList.cs
@@ -99,7 +99,7 @@ select link
         /// Parses the specified <see cref="JObject"/> into an instance of <see cref="LinkPickerList"/>.
         /// </summary>
         /// <param name="obj">An instance of <see cref="JObject"/> representing the link picker list.</param>
-        /// <returns>Returns an instacne of <see cref="LinkPickerList"/>, or <code>null</code> if <paramref name="obj"/> is <code>null</code>.</returns>
+        /// <returns>An instacne of <see cref="LinkPickerList"/>, or <c>null</c> if <paramref name="obj"/> is <c>null</c>.</returns>
         public static LinkPickerList Parse(JObject obj) {
             return obj == null ? null : new LinkPickerList(obj);
         }
@@ -108,7 +108,7 @@ public static LinkPickerList Parse(JObject obj) {
         /// Parses the specified <see cref="JArray"/> into an instance of <see cref="LinkPickerList"/>.
         /// </summary>
         /// <param name="array">An instance of <see cref="JArray"/> representing the link picker list.</param>
-        /// <returns>Returns an instacne of <see cref="LinkPickerList"/>, or <code>null</code> if <paramref name="array"/> is <code>null</code>.</returns>
+        /// <returns>An instacne of <see cref="LinkPickerList"/>, or <c>null</c> if <paramref name="array"/> is <c>null</c>.</returns>
         public static LinkPickerList Parse(JArray array) {
             return array == null ? null : new LinkPickerList(array);
         }