VS2012 Project, demo app refinement, cleaning