Pushed the Edit and Delete functionalities. Cleaned up the code