General Code Cleanup with Resharper