Simple delete and some cosmetic tweaks