Resharper cleanup 1
Resharper cleanup 2