applied some resharper cleanup