removing redundancies, simplifying code, adding deletion actions.