Adding delete, refactoring