ReSharper Code Cleanup