Performed code refactor using Resharper