Code Cleanup - VS2013U2, CM2