Remove from cart
refactoring and beautification