refactor support with resharper and upgrade to VS2012