MSBuild refactoring