refactoring
move to vs 2011