Refactoring  + working on deletion