Rewrote deletion function, changed description convention, bugfixes

Signed-off-by: Edwin van Nuil <edwin@vannuil.com>