Resharper Code Cleanup