Cart item removal/refresh, refactoring, etc