DeleteFinished: new features + code cleaning and improving
DeleteFinished: code cosmetics