Much refactor many resharper