Resharper based code cleanup (partial)