Minor tidy of CheckoutForm