refactored a bit
added delete capability