Tag deletion was called twice, fixed

renamed methods / variables to be more semantic