diff --git a/src/GitTfs.VsCommon/Wrappers.cs b/src/GitTfs.VsCommon/Wrappers.cs
index 28681ddf6..64474d501 100644
--- a/src/GitTfs.VsCommon/Wrappers.cs
+++ b/src/GitTfs.VsCommon/Wrappers.cs
@@ -24,14 +24,10 @@ public WrapperForVersionControlServer(TfsApiBridge bridge, VersionControlServer
         }
 
         public IItem GetItem(int itemId, int changesetNumber)
-        {
-            return _bridge.Wrap<WrapperForItem, Item>(_versionControlServer.GetItem(itemId, changesetNumber));
-        }
+            => _bridge.Wrap<WrapperForItem, Item>(_versionControlServer.GetItem(itemId, changesetNumber));
 
         public IItem GetItem(string itemPath, int changesetNumber)
-        {
-            return _bridge.Wrap<WrapperForItem, Item>(_versionControlServer.GetItem(itemPath, new ChangesetVersionSpec(changesetNumber)));
-        }
+            => _bridge.Wrap<WrapperForItem, Item>(_versionControlServer.GetItem(itemPath, new ChangesetVersionSpec(changesetNumber)));
 
         public IItem[] GetItems(string itemPath, int changesetNumber, TfsRecursionType recursionType)
         {
@@ -69,10 +65,7 @@ public WrapperForChangeset(TfsApiBridge bridge, Changeset changeset) : base(chan
             _changeset = changeset;
         }
 
-        public IChange[] Changes
-        {
-            get { return _bridge.Wrap<WrapperForChange, Change>(_changeset.Changes); }
-        }
+        public IChange[] Changes => _bridge.Wrap<WrapperForChange, Change>(_changeset.Changes);
 
         public string Committer
         {
@@ -89,25 +82,12 @@ public string Committer
             }
         }
 
-        public DateTime CreationDate
-        {
-            get { return _changeset.CreationDate; }
-        }
-
-        public string Comment
-        {
-            get { return _changeset.Comment; }
-        }
-
-        public int ChangesetId
-        {
-            get { return _changeset.ChangesetId; }
-        }
+        public DateTime CreationDate => _changeset.CreationDate;
+        public string Comment => _changeset.Comment;
+        public int ChangesetId => _changeset.ChangesetId;
 
         public IVersionControlServer VersionControlServer
-        {
-            get { return _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(_changeset.VersionControlServer); }
-        }
+            => _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(_changeset.VersionControlServer);
 
         public void Get(ITfsWorkspace workspace, IEnumerable<IChange> changes, Action<Exception> ignorableErrorHandler)
         {
@@ -126,15 +106,9 @@ public WrapperForChange(TfsApiBridge bridge, Change change) : base(change)
             _change = change;
         }
 
-        public TfsChangeType ChangeType
-        {
-            get { return _bridge.Convert<TfsChangeType>(_change.ChangeType); }
-        }
+        public TfsChangeType ChangeType => _bridge.Convert<TfsChangeType>(_change.ChangeType);
 
-        public IItem Item
-        {
-            get { return _bridge.Wrap<WrapperForItem, Item>(_change.Item); }
-        }
+        public IItem Item => _bridge.Wrap<WrapperForItem, Item>(_change.Item);
     }
 
     public class WrapperForItem : WrapperFor<Item>, IItem
@@ -149,39 +123,14 @@ public WrapperForItem(TfsApiBridge bridge, Item item) : base(item)
         }
 
         public IVersionControlServer VersionControlServer
-        {
-            get { return _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(_item.VersionControlServer); }
-        }
-
-        public int ChangesetId
-        {
-            get { return _item.ChangesetId; }
-        }
+            => _bridge.Wrap<WrapperForVersionControlServer, VersionControlServer>(_item.VersionControlServer);
 
-        public string ServerItem
-        {
-            get { return _item.ServerItem; }
-        }
-
-        public int DeletionId
-        {
-            get { return _item.DeletionId; }
-        }
-
-        public TfsItemType ItemType
-        {
-            get { return _bridge.Convert<TfsItemType>(_item.ItemType); }
-        }
-
-        public int ItemId
-        {
-            get { return _item.ItemId; }
-        }
-
-        public long ContentLength
-        {
-            get { return _item.ContentLength; }
-        }
+        public int ChangesetId => _item.ChangesetId;
+        public string ServerItem => _item.ServerItem;
+        public int DeletionId => _item.DeletionId;
+        public TfsItemType ItemType => _bridge.Convert<TfsItemType>(_item.ItemType);
+        public int ItemId => _item.ItemId;
+        public long ContentLength => _item.ContentLength;
 
         public TemporaryFile DownloadFile()
         {
@@ -210,15 +159,9 @@ public WrapperForIdentity(Identity identity) : base(identity)
             _identity = identity;
         }
 
-        public string MailAddress
-        {
-            get { return _identity.MailAddress; }
-        }
+        public string MailAddress => _identity.MailAddress;
 
-        public string DisplayName
-        {
-            get { return _identity.DisplayName; }
-        }
+        public string DisplayName => _identity.DisplayName;
     }
 
     public class WrapperForShelveset : WrapperFor<Shelveset>, IShelveset
@@ -234,14 +177,14 @@ public WrapperForShelveset(TfsApiBridge bridge, Shelveset shelveset) : base(shel
 
         public string Comment
         {
-            get { return _shelveset.Comment; }
-            set { _shelveset.Comment = value; }
+            get => _shelveset.Comment;
+            set => _shelveset.Comment = value;
         }
 
         public IWorkItemCheckinInfo[] WorkItemInfo
         {
-            get { return _bridge.Wrap<WrapperForWorkItemCheckinInfo, WorkItemCheckinInfo>(_shelveset.WorkItemInfo); }
-            set { _shelveset.WorkItemInfo = _bridge.Unwrap<WorkItemCheckinInfo>(value); }
+            get => _bridge.Wrap<WrapperForWorkItemCheckinInfo, WorkItemCheckinInfo>(_shelveset.WorkItemInfo);
+            set => _shelveset.WorkItemInfo = _bridge.Unwrap<WorkItemCheckinInfo>(value);
         }
     }
 
@@ -285,25 +228,13 @@ public WrapperForCheckinEvaluationResult(TfsApiBridge bridge, CheckinEvaluationR
             _result = result;
         }
 
-        public ICheckinConflict[] Conflicts
-        {
-            get { return _bridge.Wrap<WrapperForCheckinConflict, CheckinConflict>(_result.Conflicts); }
-        }
+        public ICheckinConflict[] Conflicts => _bridge.Wrap<WrapperForCheckinConflict, CheckinConflict>(_result.Conflicts);
 
-        public ICheckinNoteFailure[] NoteFailures
-        {
-            get { return _bridge.Wrap<WrapperForCheckinNoteFailure, CheckinNoteFailure>(_result.NoteFailures); }
-        }
+        public ICheckinNoteFailure[] NoteFailures => _bridge.Wrap<WrapperForCheckinNoteFailure, CheckinNoteFailure>(_result.NoteFailures);
 
-        public IPolicyFailure[] PolicyFailures
-        {
-            get { return _bridge.Wrap<WrapperForPolicyFailure, PolicyFailure>(_result.PolicyFailures); }
-        }
+        public IPolicyFailure[] PolicyFailures => _bridge.Wrap<WrapperForPolicyFailure, PolicyFailure>(_result.PolicyFailures);
 
-        public Exception PolicyEvaluationException
-        {
-            get { return _result.PolicyEvaluationException; }
-        }
+        public Exception PolicyEvaluationException => _result.PolicyEvaluationException;
     }
 
     public class WrapperForCheckinConflict : WrapperFor<CheckinConflict>, ICheckinConflict
@@ -315,20 +246,9 @@ public WrapperForCheckinConflict(CheckinConflict conflict) : base(conflict)
             _conflict = conflict;
         }
 
-        public string ServerItem
-        {
-            get { return _conflict.ServerItem; }
-        }
-
-        public string Message
-        {
-            get { return _conflict.Message; }
-        }
-
-        public bool Resolvable
-        {
-            get { return _conflict.Resolvable; }
-        }
+        public string ServerItem => _conflict.ServerItem;
+        public string Message => _conflict.Message;
+        public bool Resolvable => _conflict.Resolvable;
     }
 
     public class WrapperForCheckinNoteFailure : WrapperFor<CheckinNoteFailure>, ICheckinNoteFailure
@@ -343,14 +263,9 @@ public WrapperForCheckinNoteFailure(TfsApiBridge bridge, CheckinNoteFailure fail
         }
 
         public ICheckinNoteFieldDefinition Definition
-        {
-            get { return _bridge.Wrap<WrapperForCheckinNoteFieldDefinition, CheckinNoteFieldDefinition>(_failure.Definition); }
-        }
+            => _bridge.Wrap<WrapperForCheckinNoteFieldDefinition, CheckinNoteFieldDefinition>(_failure.Definition);
 
-        public string Message
-        {
-            get { return _failure.Message; }
-        }
+        public string Message => _failure.Message;
     }
 
     public class WrapperForCheckinNoteFieldDefinition : WrapperFor<CheckinNoteFieldDefinition>, ICheckinNoteFieldDefinition
@@ -362,25 +277,10 @@ public WrapperForCheckinNoteFieldDefinition(CheckinNoteFieldDefinition fieldDefi
             _fieldDefinition = fieldDefinition;
         }
 
-        public string ServerItem
-        {
-            get { return _fieldDefinition.ServerItem; }
-        }
-
-        public string Name
-        {
-            get { return _fieldDefinition.Name; }
-        }
-
-        public bool Required
-        {
-            get { return _fieldDefinition.Required; }
-        }
-
-        public int DisplayOrder
-        {
-            get { return _fieldDefinition.DisplayOrder; }
-        }
+        public string ServerItem => _fieldDefinition.ServerItem;
+        public string Name => _fieldDefinition.Name;
+        public bool Required => _fieldDefinition.Required;
+        public int DisplayOrder => _fieldDefinition.DisplayOrder;
     }
 
     public class WrapperForPolicyFailure : WrapperFor<PolicyFailure>, IPolicyFailure
@@ -392,10 +292,7 @@ public WrapperForPolicyFailure(PolicyFailure failure) : base(failure)
             _failure = failure;
         }
 
-        public string Message
-        {
-            get { return _failure.Message; }
-        }
+        public string Message => _failure.Message;
     }
 
     public class WrapperForWorkspace : WrapperFor<Workspace>, IWorkspace
@@ -409,10 +306,7 @@ public WrapperForWorkspace(TfsApiBridge bridge, Workspace workspace) : base(work
             _workspace = workspace;
         }
 
-        public IPendingChange[] GetPendingChanges()
-        {
-            return _bridge.Wrap<WrapperForPendingChange, PendingChange>(_workspace.GetPendingChanges());
-        }
+        public IPendingChange[] GetPendingChanges() => _bridge.Wrap<WrapperForPendingChange, PendingChange>(_workspace.GetPendingChanges());
 
         public void Shelve(IShelveset shelveset, IPendingChange[] changes, TfsShelvingOptions options)
         {
@@ -439,20 +333,12 @@ public ICheckinEvaluationResult EvaluateCheckin(TfsCheckinEvaluationOptions opti
                 _bridge.Unwrap<WorkItemCheckinInfo>(workItemChanges)));
         }
 
-        public int PendAdd(string path)
-        {
-            return _workspace.PendAdd(path);
-        }
+        public int PendAdd(string path) => _workspace.PendAdd(path);
 
         public int PendEdit(string path)
-        {
-            return _workspace.PendEdit(new string[] { path }, RecursionType.None, null, LockLevel.Unchanged, false, PendChangesOptions.ForceCheckOutLocalVersion);
-        }
+            => _workspace.PendEdit(new string[] { path }, RecursionType.None, null, LockLevel.Unchanged, false, PendChangesOptions.ForceCheckOutLocalVersion);
 
-        public int PendDelete(string path)
-        {
-            return _workspace.PendDelete(path);
-        }
+        public int PendDelete(string path) => _workspace.PendDelete(path);
 
         public int PendRename(string pathFrom, string pathTo)
         {
@@ -494,20 +380,11 @@ public void GetSpecificVersion(int changesetId, IEnumerable<IChange> changes, bo
             GetRequests(changes.Select(change => new GetRequest(new ItemSpec(change.Item.ServerItem, RecursionType.None, change.Item.DeletionId), changesetId)), noParallel);
         }
 
-        public string GetLocalItemForServerItem(string serverItem)
-        {
-            return _workspace.GetLocalItemForServerItem(serverItem);
-        }
+        public string GetLocalItemForServerItem(string serverItem) => _workspace.GetLocalItemForServerItem(serverItem);
 
-        public string GetServerItemForLocalItem(string localItem)
-        {
-            return _workspace.GetServerItemForLocalItem(localItem);
-        }
+        public string GetServerItemForLocalItem(string localItem) => _workspace.GetServerItemForLocalItem(localItem);
 
-        public string OwnerName
-        {
-            get { return _workspace.OwnerName; }
-        }
+        public string OwnerName => _workspace.OwnerName;
 
         public void Merge(string sourceTfsPath, string targetTfsPath)
         {
@@ -547,7 +424,6 @@ public int Checkin(IPendingChange[] changes, string comment, string author, IChe
 
         public void GetRequests(IEnumerable<GetRequest> source, bool noParallel, int batchSize = 20)
         {
-
             source.ToBatch(batchSize).ForEach(batch =>
             {
                 var items = batch;
@@ -578,19 +454,8 @@ public WrapperForBranchObject(BranchObject branch)
             _branch = branch;
         }
 
-        public string Path
-        {
-            get { return _branch.Properties.RootItem.Item; }
-        }
-
-        public bool IsRoot
-        {
-            get { return _branch.Properties.ParentBranch == null; }
-        }
-
-        public string ParentPath
-        {
-            get { return _branch.Properties.ParentBranch.Item; }
-        }
+        public string Path => _branch.Properties.RootItem.Item;
+        public bool IsRoot => _branch.Properties.ParentBranch == null;
+        public string ParentPath => _branch.Properties.ParentBranch.Item;
     }
 }
\ No newline at end of file