Resharper cleanup