ReSharper Cleanup