Resharper based code cleanup  (partial)
Resharper based code cleanup (partial)
Resharper based code cleanup (partial)