cart and checkout tidy