Added the flow change after delete and cosmetic changes.