Refactor delete action
Fix #37