MSBuild refactoring
Code clean up