style improvement; bugfix for OnDelete