Fix clone problem
Make on delete run sooner
Whitespace change