Followed suggestions from Resharper