Resharper error cleanup