'Delete' OK; tidied up.

Now on to 'add'!