Refactor with vs2012