Cleanup with Resharper