Further cleanup of checkout view.