upgrade to VS2013 and formatting changes