Code cleanup
Updated to VS2013