Updated class to ReSharper recommendations.