Refactoring

VS2012 added