refactor resharper 2