Resharper cleanup pass