Refactoring, added delete()