Refactored remove and add functions