Upgrade to vs 2015
reformat