MSBuild targets refactoring