Refactoring In VS2017