just a little bit of cleanup and vs2013 update