Deletion working via swiping on table view cell plus some refactoring