Refactor collaboration. Resharper suggestions