Resharper clean up